[2353] Restore isc.config.ModuleCCSession during tearDown()

diff --git a/src/bin/bind10/tests/bind10_test.py.in b/src/bin/bind10/tests/bind10_test.py.in
index 2bf16cad2aa608422ee0443c45b035d3e3a17706..1723d3340dd4fafba8b6b7a47b793e28cdfc2759 100644 (file)
--- a/src/bin/bind10/tests/bind10_test.py.in
+++ b/src/bin/bind10/tests/bind10_test.py.in
@@ -1233,14 +1233,15 @@ class TestBossComponents(unittest.TestCase):
         }
         self._tmp_time = None
         self._tmp_sleep = None
+        self._tmp_ccsession = None
 
     def tearDown(self):
         if self._tmp_time is not None:
             time.time = self._tmp_time
         if self._tmp_sleep is not None:
             time.sleep = self._tmp_sleep
-
-
+        if self._tmp_ccsession is not None:
+            isc.config.ModuleCCSession = self._tmp_ccsession
 
     def __unary_hook(self, param):
         """
@@ -1760,7 +1761,7 @@ class TestBossComponents(unittest.TestCase):
             def start(self):
                 self.started = True
         bob = MockBobSimple()
-        tmp = isc.config.ModuleCCSession
+        self._tmp_ccsession = isc.config.ModuleCCSession
         isc.config.ModuleCCSession = DummySession
 
         bob.start_ccsession({})
@@ -1770,7 +1771,7 @@ class TestBossComponents(unittest.TestCase):
         self.assertEqual(bob.msgq_socket_file, bob.ccs.socket_file)
         self.assertTrue(bob.ccs.started)
 
-        isc.config.ModuleCCSession = tmp
+        # isc.config.ModuleCCSession is restored during tearDown().
 
     def test_start_process(self):
         '''Test that processes can be started.'''