From: Daira Hopwood 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/zeppelin?a=commitdiff_plain;h=bcc284bb004b078156a907233845c5daa2869aeb;p=tahoe-lafs%2Ftahoe-lafs.git Remove redundant calls to _scan and startService. Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/frontends/drop_upload.py b/src/allmydata/frontends/drop_upload.py index 7c3e48e9..2e494ab4 100644 --- a/src/allmydata/frontends/drop_upload.py +++ b/src/allmydata/frontends/drop_upload.py @@ -204,7 +204,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 9cfe6508..74e0e16a 100644 --- a/src/allmydata/test/test_drop_upload.py +++ b/src/allmydata/test/test_drop_upload.py @@ -47,10 +47,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):