From a797f468dcbc6434ca980085852b60bbb7e62d75 Mon Sep 17 00:00:00 2001
From: David Stainton <dstainton415@gmail.com>
Date: Wed, 27 Jan 2016 15:59:45 +0000
Subject: [PATCH] Fix cleanup after test_periodic_full_scan.

---
 src/allmydata/test/test_magic_folder.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py
index 383a41ca..7920ec58 100644
--- 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):
-- 
2.45.2