]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
Solve a potential race condition by waiting until the uploader is started.
authorDaira Hopwood <daira@jacaranda.org>
Thu, 3 Sep 2015 19:21:10 +0000 (20:21 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Tue, 15 Sep 2015 17:43:00 +0000 (18:43 +0100)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/test/test_magic_folder.py

index 3d76799f42c0d5cacdba702e3c8e5950a06772c8..ecb08a6aa1f0d1becdad9e0c63b3bc35b5563dd6 100644 (file)
@@ -49,6 +49,7 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual
         def _restarted(ign):
             print "_restarted"
             self.magicfolder = self.get_client().getServiceNamed('magic-folder')
+            return self.magicfolder.uploader.started_d
         d.addCallback(_restarted)
         return d