[Python-checkins] r78009 - python/trunk/Lib/test/test_logging.py

[vinay.sajip]

Author: vinay.sajip
Date: Sat Feb  6 00:43:11 2010
New Revision: 78009

Log:
test_logging: minor tweaks to timeouts, listening tests marked as skipped.

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

Modified: python/trunk/Lib/test/test_logging.py
==============================================================================
--- python/trunk/Lib/test/test_logging.py	(original)
+++ python/trunk/Lib/test/test_logging.py	Sat Feb  6 00:43:11 2010
@@ -1579,6 +1579,7 @@
         t.start()
         try:
             sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            sock.settimeout(2.0)
             sock.connect(('localhost', port))
 
             slen = struct.pack('>L', len(text))
@@ -1592,9 +1593,10 @@
             sock.close()
         finally:
             logging.config.stopListening()
-            t.join()
+            t.join(2.0)
 
-    def notest_listen_config_10_ok(self):
+    @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))
             logger = logging.getLogger("compiler.parser")
@@ -1613,7 +1615,8 @@
                 ('ERROR', '4'),
             ], stream=output)
 
-    def notest_listen_config_1_ok(self):
+    @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))
             logger = logging.getLogger("compiler.parser")