drop-upload: rename 'start' method to 'startService', which is what you're supposed...

diff --git a/src/allmydata/client.py b/src/allmydata/client.py
index 7713b4fe022f50721d42e91eb38c97c103349c1f..d007b8b17734060f8998a4adc0ac9c1b3120023b 100644 (file)
--- a/src/allmydata/client.py
+++ b/src/allmydata/client.py
@@ -432,7 +432,7 @@ class Client(node.Node, pollmixin.PollMixin):
                     from allmydata.frontends import drop_upload
                     s = drop_upload.DropUploader(self, upload_dircap, local_dir_utf8)
                     s.setServiceParent(self)
-                    s.start()
+                    s.startService()
                 except Exception, e:
                     self.log("couldn't start drop-uploader: %r", args=(e,))
             else:

diff --git a/src/allmydata/frontends/drop_upload.py b/src/allmydata/frontends/drop_upload.py
index e8b1cdebdfdea268048d1489dd0e5ee0671db4a6..b8d2a940df15bb508021db4674ff49404197eecc 100644 (file)
--- a/src/allmydata/frontends/drop_upload.py
+++ b/src/allmydata/frontends/drop_upload.py
@@ -59,7 +59,8 @@ class DropUploader(service.MultiService):
         mask = inotify.IN_CLOSE_WRITE | inotify.IN_MOVED_TO | inotify.IN_ONLYDIR
         self._notifier.watch(self._local_path, mask=mask, callbacks=[self._notify])
 
-    def start(self):
+    def startService(self):
+        service.MultiService.startService(self)
         d = self._notifier.startReading()
         self._stats_provider.count('drop_upload.dirs_monitored', 1)
         return d

diff --git a/src/allmydata/test/test_drop_upload.py b/src/allmydata/test/test_drop_upload.py
index ea21ff02914cdee0460263b9e0b64a9f24017834..30cbe1cb65483689b857fe548abd55135ef6abdb 100644 (file)
--- a/src/allmydata/test/test_drop_upload.py
+++ b/src/allmydata/test/test_drop_upload.py
@@ -69,7 +69,7 @@ class DropUploadTestMixin(GridTestMixin, ShouldFailMixin, ReallyEqualMixin):
             self.upload_dircap = n.get_uri()
             self.uploader = DropUploader(self.client, self.upload_dircap, self.local_dir.encode('utf-8'),
                                          inotify=self.inotify)
-            return self.uploader.start()
+            return self.uploader.startService()
         d.addCallback(_made_upload_dir)
 
         # Write something short enough for a LIT file.