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

more startup waiting

Browse Source
This commit is contained in:
meejah 2016-03-15 09:50:42 -06:00 committed by Brian Warner
parent faed2574d6
commit 5f073c6987
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,10 +259,12 @@ class MagicFolderAliceBobTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, Rea
self.alice_magicfolder = self.init_magicfolder(0, self.alice_upload_dircap, self.alice_magicfolder = self.init_magicfolder(0, self.alice_upload_dircap,
self.alice_collective_dircap, self.alice_collective_dircap,
self.alice_magic_dir, self.alice_clock) self.alice_magic_dir, self.alice_clock)
d = self.alice_magicfolder.uploader.set_hook('iteration') d0 = self.alice_magicfolder.uploader.set_hook('iteration')
d1 = self.alice_magicfolder.downloader.set_hook('iteration')
self.alice_clock.advance(self.alice_magicfolder.uploader.scan_interval + 1) self.alice_clock.advance(self.alice_magicfolder.uploader.scan_interval + 1)
d.addCallback(lambda ign: result) d0.addCallback(lambda ign: d1)
return d d1.addCallback(lambda ign: result)
return d1
d.addCallback(get_Alice_magicfolder) d.addCallback(get_Alice_magicfolder)
# Alice invites Bob. Bob joins. # Alice invites Bob. Bob joins.
@ -280,10 +282,12 @@ class MagicFolderAliceBobTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, Rea
self.bob_magicfolder = self.init_magicfolder(1, self.bob_upload_dircap, self.bob_magicfolder = self.init_magicfolder(1, self.bob_upload_dircap,
self.bob_collective_dircap, self.bob_collective_dircap,
self.bob_magic_dir, self.bob_clock) self.bob_magic_dir, self.bob_clock)
d = self.bob_magicfolder.uploader.set_hook('iteration') d0 = self.bob_magicfolder.uploader.set_hook('iteration')
d1 = self.bob_magicfolder.downloader.set_hook('iteration')
self.bob_clock.advance(self.alice_magicfolder.uploader.scan_interval + 1) self.bob_clock.advance(self.alice_magicfolder.uploader.scan_interval + 1)
d.addCallback(lambda ign: result) d0.addCallback(lambda ign: d1)
return d d1.addCallback(lambda ign: result)
return d1
d.addCallback(get_Bob_magicfolder) d.addCallback(get_Bob_magicfolder)
return d return d
@ -468,6 +472,7 @@ class MagicFolderAliceBobTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, Rea
@defer.inlineCallbacks @defer.inlineCallbacks
def test_download_retry(self): def test_download_retry(self):
print("starting actual download_retry test")
alice_fname = os.path.join(self.alice_magic_dir, 'blam') alice_fname = os.path.join(self.alice_magic_dir, 'blam')
bob_fname = os.path.join(self.bob_magic_dir, 'blam') bob_fname = os.path.join(self.bob_magic_dir, 'blam')