[Python-checkins] r78108 - in python/trunk/Lib: logging/config.py test/test_logging.py

[vinay.sajip]

Author: vinay.sajip
Date: Mon Feb  8 22:18:15 2010
New Revision: 78108

Log:
logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.

Modified:
   python/trunk/Lib/logging/config.py
   python/trunk/Lib/test/test_logging.py

Modified: python/trunk/Lib/logging/config.py
==============================================================================
--- python/trunk/Lib/logging/config.py	(original)
+++ python/trunk/Lib/logging/config.py	Mon Feb  8 22:18:15 2010
@@ -803,6 +803,8 @@
                             raise
                         except:
                             traceback.print_exc()
+                    if self.server.ready:
+                        self.server.ready.set()
             except socket.error, e:
                 if not isinstance(e.args, tuple):
                     raise
@@ -819,12 +821,13 @@
         allow_reuse_address = 1
 
         def __init__(self, host='localhost', port=DEFAULT_LOGGING_CONFIG_PORT,
-                     handler=None):
+                     handler=None, ready=None):
             ThreadingTCPServer.__init__(self, (host, port), handler)
             logging._acquireLock()
             self.abort = 0
             logging._releaseLock()
             self.timeout = 1
+            self.ready = ready
 
         def serve_until_stopped(self):
             import select
@@ -849,7 +852,8 @@
             self.ready = threading.Event()
 
         def run(self):
-            server = self.rcvr(port=self.port, handler=self.hdlr)
+            server = self.rcvr(port=self.port, handler=self.hdlr,
+                               ready=self.ready)
             self.ready.set()
             global _listener
             logging._acquireLock()

Modified: python/trunk/Lib/test/test_logging.py
==============================================================================
--- python/trunk/Lib/test/test_logging.py	(original)
+++ python/trunk/Lib/test/test_logging.py	Mon Feb  8 22:18:15 2010
@@ -1594,7 +1594,6 @@
             logging.config.stopListening()
             t.join(2.0)
 
-    #@unittest.skip("See issue #7857")
     def test_listen_config_10_ok(self):
         with captured_stdout() as output:
             self.setup_via_listener(json.dumps(self.config10))
@@ -1614,7 +1613,6 @@
                 ('ERROR', '4'),
             ], stream=output)
 
-    @unittest.skip("See issue #7857")
     def test_listen_config_1_ok(self):
         with captured_stdout() as output:
             self.setup_via_listener(textwrap.dedent(ConfigFileTest.config1))