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

Simplify the cleanup_Alice_and_Bob callback.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-10-08 14:42:47 +01:00 committed by Brian Warner
parent 94a2ef0095
commit c2d672e0b6
1 changed files with 4 additions and 4 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

@ -411,16 +411,16 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual
print "cleanup alice bob test\n" print "cleanup alice bob test\n"
d = defer.succeed(None) d = defer.succeed(None)
d.addCallback(lambda ign: self.alice_magicfolder.finish()) d.addCallback(lambda ign: self.alice_magicfolder.finish())
alice_clock.advance(0)
def clean_bob(_): def clean_bob(ign):
d2 = self.bob_magicfolder.finish() d2 = self.bob_magicfolder.finish()
d2.addCallback(lambda ign: result)
bob_clock.advance(0) bob_clock.advance(0)
return d2 return d2
d.addCallback(clean_bob) d.addCallback(clean_bob)
alice_clock.advance(0) d.addCallback(lambda ign: result)
return d return d
d.addCallback(cleanup_Alice_and_Bob) d.addBoth(cleanup_Alice_and_Bob)
return d return d
class MockTest(MagicFolderTestMixin, unittest.TestCase): class MockTest(MagicFolderTestMixin, unittest.TestCase):