Browse Source

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

Mukund Sivaraman 12 years ago
parent
commit
2c2459fd09
2 changed files with 6 additions and 8 deletions
  1. 0 2
      src/bin/bind10/bind10_src.py.in
  2. 6 6
      src/bin/bind10/tests/bind10_test.py.in

+ 0 - 2
src/bin/bind10/bind10_src.py.in

@@ -509,8 +509,6 @@ class BoB:
         self.ccs.start()
         self.ccs.start()
         logger.debug(DBG_PROCESS, BIND10_STARTED_CC)
         logger.debug(DBG_PROCESS, BIND10_STARTED_CC)
 
 
-        return self.ccs
-
     # A couple of utility methods for starting processes...
     # A couple of utility methods for starting processes...
 
 
     def start_process(self, name, args, c_channel_env, port=None, address=None):
     def start_process(self, name, args, c_channel_env, port=None, address=None):

+ 6 - 6
src/bin/bind10/tests/bind10_test.py.in

@@ -1755,12 +1755,12 @@ class TestBossComponents(unittest.TestCase):
         tmp = isc.config.ModuleCCSession
         tmp = isc.config.ModuleCCSession
         isc.config.ModuleCCSession = DummySession
         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
         isc.config.ModuleCCSession = tmp