projects
/
tahoe-lafs
/
tahoe-lafs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9244ac2
)
Fix cleanup after test_periodic_full_scan.
author
David Stainton
<dstainton415@gmail.com>
Wed, 27 Jan 2016 15:59:45 +0000
(15:59 +0000)
committer
Daira Hopwood
<daira@jacaranda.org>
Fri, 5 Feb 2016 22:13:37 +0000
(22:13 +0000)
src/allmydata/test/test_magic_folder.py
patch
|
blob
|
history
diff --git
a/src/allmydata/test/test_magic_folder.py
b/src/allmydata/test/test_magic_folder.py
index 383a41ca14f199a427701f75241ff31cf59a1369..7920ec5822a7c214e2fa1b4d0e06fd49e27b8ba3 100644
(file)
--- a/
src/allmydata/test/test_magic_folder.py
+++ b/
src/allmydata/test/test_magic_folder.py
@@
-1245,7
+1245,11
@@
class MockTest(MagicFolderTestMixin, unittest.TestCase):
return processed_d
d.addCallback(_advance_clock)
d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('uploader.files_uploaded'), 1))
- d.addCallback(lambda ign: self.magicfolder.finish())
+ def cleanup(res):
+ d2 = self.magicfolder.finish()
+ alice_clock.advance(0)
+ return d2
+ d.addCallback(cleanup)
return d
class RealTest(MagicFolderTestMixin, unittest.TestCase):