From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 8 Sep 2015 14:29:48 +0000 (+0100)
Subject: restart_client needs to remove the old client from its parent, not just stop it.
X-Git-Url: https://git.rkrishnan.org/nxhtml.html?a=commitdiff_plain;h=879a45e8b1fcc8dcacfa1e194153a299b68348cd;p=tahoe-lafs%2Ftahoe-lafs.git

restart_client needs to remove the old client from its parent, not just stop it.

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

diff --git a/src/allmydata/test/no_network.py b/src/allmydata/test/no_network.py
index f5578ac3..4e6249e5 100644
--- a/src/allmydata/test/no_network.py
+++ b/src/allmydata/test/no_network.py
@@ -386,7 +386,7 @@ class GridTestMixin:
     def restart_client(self, i=0):
         client = self.g.clients[i]
         d = defer.succeed(None)
-        d.addCallback(lambda ign: client.stopService())
+        d.addCallback(lambda ign: self.g.removeService(client))
         def _make_client(ign):
             c = self.g.make_client(i, write_config=False)
             self.g.clients[i] = c