ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-23 23:02:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

possible less race-y startup

Browse Source
This commit is contained in:
meejah 2016-03-15 09:41:02 -06:00 committed by Brian Warner
parent 378ce27cbd
commit faed2574d6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/allmydata/test/test_magic_folder.py
View File

@ -259,8 +259,10 @@ class MagicFolderAliceBobTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, Rea
self.alice_magicfolder = self.init_magicfolder(0, self.alice_upload_dircap,
self.alice_collective_dircap,
self.alice_magic_dir, self.alice_clock)
d = self.alice_magicfolder.uploader.set_hook('iteration')
self.alice_clock.advance(self.alice_magicfolder.uploader.scan_interval + 1)
return result
d.addCallback(lambda ign: result)
return d
d.addCallback(get_Alice_magicfolder)
# Alice invites Bob. Bob joins.
@ -278,8 +280,10 @@ class MagicFolderAliceBobTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, Rea
self.bob_magicfolder = self.init_magicfolder(1, self.bob_upload_dircap,
self.bob_collective_dircap,
self.bob_magic_dir, self.bob_clock)
d = self.bob_magicfolder.uploader.set_hook('iteration')
self.bob_clock.advance(self.alice_magicfolder.uploader.scan_interval + 1)
return result
d.addCallback(lambda ign: result)
return d
d.addCallback(get_Bob_magicfolder)
return d