[svn] commit: r3141 - in /branches/trac335/src/bin/zonemgr: tests/zonemgr_test.py zonemgr.py.in

[BIND 10 source code commits]

Author: chenzhengzhang
Date: Fri Oct  8 05:50:05 2010
New Revision: 3141

Log:
Modified according to comments.

Modified:
    branches/trac335/src/bin/zonemgr/tests/zonemgr_test.py
    branches/trac335/src/bin/zonemgr/zonemgr.py.in

Modified: branches/trac335/src/bin/zonemgr/tests/zonemgr_test.py
==============================================================================
--- branches/trac335/src/bin/zonemgr/tests/zonemgr_test.py (original)
+++ branches/trac335/src/bin/zonemgr/tests/zonemgr_test.py Fri Oct  8 05:50:05 2010
@@ -394,6 +394,7 @@
         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 @@
         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):

Modified: branches/trac335/src/bin/zonemgr/zonemgr.py.in
==============================================================================
--- branches/trac335/src/bin/zonemgr/zonemgr.py.in (original)
+++ branches/trac335/src/bin/zonemgr/zonemgr.py.in Fri Oct  8 05:50:05 2010
@@ -369,7 +369,7 @@
             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)