From: Daira Hopwood <daira@jacaranda.org>
Date: Wed, 15 Apr 2015 13:03:03 +0000 (+0100)
Subject: DropUploader.startService returns a deferred; don't drop it.
X-Git-Url: https://git.rkrishnan.org/simplejson/rgr-080307.php?a=commitdiff_plain;h=80645c26feba31d878a27f72d011b1bbd0188e5c;p=tahoe-lafs%2Ftahoe-lafs.git

DropUploader.startService returns a deferred; don't drop it.

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

diff --git a/src/allmydata/test/test_drop_upload.py b/src/allmydata/test/test_drop_upload.py
index 8a4fc9ee..141686e0 100644
--- a/src/allmydata/test/test_drop_upload.py
+++ b/src/allmydata/test/test_drop_upload.py
@@ -43,9 +43,10 @@ class DropUploadTestMixin(GridTestMixin, ShouldFailMixin, ReallyEqualMixin, NonA
             self.uploader = DropUploader(self.client, self.upload_dircap, self.local_dir.encode('utf-8'),
                                          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.