test fixes

master/buildbot/test/unit/test_schedulers_manager.py

@@ -120,10 +120,9 @@ def test_reconfigService_add_and_change_and_remove(self):
 
         self.new_config.schedulers = {}
 
+        self.assertEqual(sch1.running, True)
         yield self.sm.reconfigServiceWithBuildbotConfig(self.new_config)
-
-        self.assertIdentical(sch1.parent, None)
-        self.assertIdentical(sch1.master, None)
+        self.assertEqual(sch1.running, False)
 
     @defer.inlineCallbacks
     def test_reconfigService_class_name_change(self):

master/buildbot/test/unit/test_worker_manager.py

@@ -75,10 +75,10 @@ def test_reconfigServiceWorkers_add_remove(self):
 
         self.new_config.workers = []
 
+        self.assertEqual(worker.running, True)
         yield self.workers.reconfigServiceWithBuildbotConfig(self.new_config)
 
-        self.assertIdentical(worker.parent, None)
-        self.assertIdentical(worker.master, None)
+        self.assertEqual(worker.running, False)
 
     @defer.inlineCallbacks
     def test_reconfigServiceWorkers_reconfig(self):

master/buildbot/util/service.py

@@ -400,6 +400,8 @@ def reconfigServiceWithBuildbotConfig(self, new_config):
                 # (this is related to the fact that self.master is found by recursively looking at self.parent
                 # for a master)
                 yield child.stopService()
+                # it has already called, so do not call it again
+                child.stopService = lambda: None
                 yield child.disownServiceParent()
                 # HACK: we still keep a reference to the master for some cleanup tasks which are not waited by
                 # to stopService (like the complex worker disconnection mechanism)

master/docs/relnotes/index.rst

@@ -26,6 +26,8 @@ Master
   Hyper_ is a CaaS solution for hosting docker container in the cloud, billed to the second.
   It forms a very cost efficient solution to run your CI in the cloud.
 
+.. _Hyper: https://hyper.sh
+
 Features
 ~~~~~~~~