[2353] Rewrite code that depended on BoB.start_ccsession() returning a value

diff --git a/src/bin/bind10/bind10_src.py.in b/src/bin/bind10/bind10_src.py.in
index 9d6b48d1ada4ba1a82a4546caee2740021470c4a..592dc3fb03c4647990e542aae188a6753bf34f7e 100755 (executable)
--- a/src/bin/bind10/bind10_src.py.in
+++ b/src/bin/bind10/bind10_src.py.in
@@ -509,8 +509,6 @@ class BoB:
         self.ccs.start()
         logger.debug(DBG_PROCESS, BIND10_STARTED_CC)
 
-        return self.ccs
-
     # A couple of utility methods for starting processes...
 
     def start_process(self, name, args, c_channel_env, port=None, address=None):

diff --git a/src/bin/bind10/tests/bind10_test.py.in b/src/bin/bind10/tests/bind10_test.py.in
index bc404267eebaf98728c1d03c600848991726b1ea..66e6c7e98cb0b9c5bee26b1a393d54bc6edfc879 100644 (file)
--- a/src/bin/bind10/tests/bind10_test.py.in
+++ b/src/bin/bind10/tests/bind10_test.py.in
@@ -1755,12 +1755,12 @@ class TestBossComponents(unittest.TestCase):
         tmp = isc.config.ModuleCCSession
         isc.config.ModuleCCSession = DummySession
 
-        ccs = bob.start_ccsession({})
-        self.assertEqual(bind10_src.SPECFILE_LOCATION, ccs.specfile)
-        self.assertEqual(bob.config_handler, ccs.config_handler)
-        self.assertEqual(bob.command_handler, ccs.command_handler)
-        self.assertEqual(bob.msgq_socket_file, ccs.socket_file)
-        self.assertTrue(ccs.started)
+        bob.start_ccsession({})
+        self.assertEqual(bind10_src.SPECFILE_LOCATION, bob.ccs.specfile)
+        self.assertEqual(bob.config_handler, bob.ccs.config_handler)
+        self.assertEqual(bob.command_handler, bob.ccs.command_handler)
+        self.assertEqual(bob.msgq_socket_file, bob.ccs.socket_file)
+        self.assertTrue(bob.ccs.started)
 
         isc.config.ModuleCCSession = tmp