From 53b40ef0e008883f23eb2ca71c5ae003811a0dc1 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 28 Mar 2019 16:10:36 -0400 Subject: [PATCH 1/3] don't double start; don't try to handle double start. --- src/allmydata/client.py | 1 - src/allmydata/frontends/magic_folder.py | 3 --- 2 files changed, 4 deletions(-) diff --git a/src/allmydata/client.py b/src/allmydata/client.py index b6815c3d1..636be54da 100644 --- a/src/allmydata/client.py +++ b/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): diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index 85b940914..7ada163c2 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/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() From d430f6b63e20748fa44ba5dc587e5ee27814a79c Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 28 Mar 2019 16:10:54 -0400 Subject: [PATCH 2/3] news fragment --- newsfragments/3017.minor | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newsfragments/3017.minor diff --git a/newsfragments/3017.minor b/newsfragments/3017.minor new file mode 100644 index 000000000..e69de29bb From a4a73a20a23d9fc743a431ccdb06aede2e967982 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 28 Mar 2019 16:18:43 -0400 Subject: [PATCH 3/3] Fix incorrect assertion --- src/allmydata/test/test_client.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/allmydata/test/test_client.py b/src/allmydata/test/test_client.py index 95ad936ad..1d0fa085c 100644 --- a/src/allmydata/test/test_client.py +++ b/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