From: Mukund Sivaraman <muks@isc.org>
Date: Thu, 29 Nov 2012 02:27:16 +0000 (+0530)
Subject: [2353] Rewrite code that depended on BoB.start_ccsession() returning a value
X-Git-Tag: bind10-1.0.0-beta-release~19^2~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c2459fd09fd1fb9b2c741eca0b93a8550f3f9b3;p=thirdparty%2Fkea.git

[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 9d6b48d1ad..592dc3fb03 100755
--- 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 bc404267ee..66e6c7e98c 100644
--- 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