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:
2862043
)
Solve a potential race condition by waiting until the uploader is started.
author
Daira Hopwood
<daira@jacaranda.org>
Thu, 3 Sep 2015 19:21:10 +0000
(20:21 +0100)
committer
Daira Hopwood
<daira@jacaranda.org>
Wed, 30 Sep 2015 15:45:26 +0000
(16:45 +0100)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
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 3d76799f42c0d5cacdba702e3c8e5950a06772c8..ecb08a6aa1f0d1becdad9e0c63b3bc35b5563dd6 100644
(file)
--- 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