From: Daira Hopwood <daira@jacaranda.org>
Date: Mon, 20 Apr 2015 23:02:33 +0000 (+0100)
Subject: Remove redundant calls to _scan and startService.
X-Git-Url: https://git.rkrishnan.org/vdrive/%22news.html/simplejson/provisioning?a=commitdiff_plain;h=a6fa3cf7994bc1e1c93a3dcf80e3d009fb2ba4c0;p=tahoe-lafs%2Ftahoe-lafs.git

Remove redundant calls to _scan and startService.

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

diff --git a/src/allmydata/frontends/drop_upload.py b/src/allmydata/frontends/drop_upload.py
index a482caf7..f4666f50 100644
--- a/src/allmydata/frontends/drop_upload.py
+++ b/src/allmydata/frontends/drop_upload.py
@@ -209,7 +209,6 @@ class DropUploader(service.MultiService):
                 #dirname = path.decode(get_filesystem_encoding())
                 dirname = path
 
-            reactor.callLater(0, self._scan, dirname)
             return self._parent.create_subdirectory(name)
 
         def _maybe_upload(val):
diff --git a/src/allmydata/test/test_drop_upload.py b/src/allmydata/test/test_drop_upload.py
index afbc3a49..14cecb81 100644
--- a/src/allmydata/test/test_drop_upload.py
+++ b/src/allmydata/test/test_drop_upload.py
@@ -48,10 +48,8 @@ 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, pending_delay=0.2)
         self.uploader.setServiceParent(self.client)
-        d = self.uploader.startService()
         self.uploader.upload_ready()
         self.failUnlessEqual(self.uploader._db.VERSION, 2)
-        return d
 
     # Prevent unclean reactor errors.
     def _cleanup(self, res):