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

keep everything in the test context

Browse Source
This commit is contained in:
Jean-Paul Calderone 2019-02-27 15:08:10 -05:00
parent 725c85b2f4
commit fdd603e42d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1208,7 +1208,7 @@ class MagicFolderAliceBobTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, Rea
# the other tests in here should get their own minimal test-case.
@skipIf(sys.platform == "win32", "Still inotify problems on Windows (FIXME)")
def test_alice_bob(self):
d = defer.succeed(None)
d = DeferredContext(defer.succeed(None))
# XXX FIXME just quickly porting this test via aliases -- the
# "real" solution is to break out any relevant test-cases as
@ -1555,8 +1555,7 @@ class MagicFolderAliceBobTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, Rea
d.addCallback(lambda ign: self._check_downloader_count('objects_conflicted', 0, magic=self.alice_magicfolder))
d.addCallback(lambda ign: self._check_downloader_count('objects_failed', 0, magic=self.alice_magicfolder))
d.addCallback(lambda ign: self._check_downloader_count('objects_downloaded', 3, magic=self.alice_magicfolder))
return d
return d.addActionFinish()
test_alice_bob.timeout = 300