Merge pull request #591 from tahoe-lafs/3017.magic-folder-double-start

Fix the MagicFolder double start problem

src/allmydata/client.py

@@ -761,7 +761,6 @@ class _Client(node.Node, pollmixin.PollMixin):
                 s = magic_folder.MagicFolder.from_config(self, name, mf_config)
                 self._magic_folders[name] = s
                 s.setServiceParent(self)
-                s.startService()
 
                 connected_d = self.storage_broker.when_connected_enough(threshold)
                 def connected_enough(ign, mf):

src/allmydata/frontends/magic_folder.py

@@ -402,9 +402,6 @@ class MagicFolder(service.MultiService):
         self._public_status = (status, messages)
 
     def startService(self):
-        # TODO: why is this being called more than once?
-        if self.running:
-            return defer.succeed(None)
         service.MultiService.startService(self)
         return self.uploader.start_monitoring()
 

src/allmydata/test/test_client.py

@@ -617,7 +617,8 @@ class Basic(testutil.ReallyEqualMixin, testutil.NonASCIIPathMixin, unittest.Test
         self.failUnlessReallyEqual(magicfolder.upload_dircap, upload_dircap)
         self.failUnlessReallyEqual(os.path.basename(magicfolder.local_dir), local_dir_u)
         self.failUnless(magicfolder.inotify is None, magicfolder.inotify)
-        self.failUnless(magicfolder.running)
+        # It doesn't start until the client starts.
+        self.assertFalse(magicfolder.running)
 
         # See above.
         boom = True