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:
bea5384
)
DropUploader.startService returns a deferred; don't drop it.
author
Daira Hopwood
<daira@jacaranda.org>
Wed, 15 Apr 2015 13:03:03 +0000
(14:03 +0100)
committer
Daira Hopwood
<daira@jacaranda.org>
Tue, 28 Apr 2015 18:22:28 +0000
(19:22 +0100)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/test/test_drop_upload.py
patch
|
blob
|
history
diff --git
a/src/allmydata/test/test_drop_upload.py
b/src/allmydata/test/test_drop_upload.py
index ae5bb23682de9d39fdc7e0cb4a13c65262c23bf1..3583ca68a207495b45e9fd63ce5515e9b7e808d5 100644
(file)
--- a/
src/allmydata/test/test_drop_upload.py
+++ b/
src/allmydata/test/test_drop_upload.py
@@
-81,9
+81,10
@@
class DropUploadTestMixin(GridTestMixin, ShouldFailMixin, ReallyEqualMixin, NonA
self.uploader = DropUploader(self.client, self.upload_dircap, self.local_dir.encode('utf-8'),
"magicfolderdb.sqlite", inotify=self.inotify)
self.uploader.setServiceParent(self.client)
- self.uploader.startService()
+
d =
self.uploader.startService()
self.uploader.upload_ready()
- return None
+ return d
+
d.addCallback(_made_upload_dir)
# Write something short enough for a LIT file.