Modified according to comments.

git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac335@3141 e5f2f494-b856-4b98-b285-d166d9295462

src/bin/zonemgr/tests/zonemgr_test.py

@@ -394,6 +394,7 @@ class TestZonemgrRefresh(unittest.TestCase):
         listener = threading.Thread(target = self.zone_refresh.run_timer, args = ())
         listener.setDaemon(True)
         listener.start()
+        # Sleep 1 sec to ensure that the timer thread has enough time to run.
         time.sleep(1)
         self.zone_refresh.shutdown()
         self.assertFalse(listener.is_alive())
@@ -402,18 +403,14 @@ class TestZonemgrRefresh(unittest.TestCase):
         self.assertTrue("refresh_timeout" in self.zone_refresh._zonemgr_refresh_info[ZONE_NAME_CLASS1_IN].keys())
         self.assertTrue(zone_state == ZONE_REFRESHING)
 
-        # test select.error by using bad file descriptor 
-        bad_file_descriptor = self.zone_refresh._master_socket.fileno()
-        self.zone_refresh._check_sock = bad_file_descriptor  
-        self.zone_refresh._master_socket.close()
-        self.assertRaises(None, self.zone_refresh.run_timer()) 
-
     def test_shutdown(self):
         self.zone_refresh._check_sock = self.zone_refresh._master_socket 
         listener = threading.Thread(target=self.zone_refresh.run_timer)
         listener.start()
         self.assertTrue(listener.is_alive())
         self.zone_refresh.shutdown()
+        # Sleep 1 sec to ensure that the timer thread has enough time to exit.
+        time.sleep(1)
         self.assertFalse(listener.is_alive())
 
     def tearDown(self):

src/bin/zonemgr/zonemgr.py.in

@@ -369,7 +369,7 @@ class ZonemgrRefresh:
             if not rlist: # timer timeout 
                 continue
             if self._read_sock in rlist: # awaken by shutdown socket 
-                break 
+                continue 
             if self._check_sock in rlist: # awaken by check socket
                 self._check_sock.recv(5)