From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 3 Sep 2015 19:21:10 +0000 (+0100)
Subject: Solve a potential race condition by waiting until the uploader is started.
X-Git-Url: https://git.rkrishnan.org/vdrive/%22news.html/simplejson/%22file:?a=commitdiff_plain;h=15d0704063cbaded71ac80b0385eb16b57210e8d;p=tahoe-lafs%2Ftahoe-lafs.git

Solve a potential race condition by waiting until the uploader is started.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py
index 3d76799f..ecb08a6a 100644
--- a/src/allmydata/test/test_magic_folder.py
+++ b/src/allmydata/test/test_magic_folder.py
@@ -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