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

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 43a4438ab4317ba3ec41d96e17001d679a9a0eec..8cbc060bf627ebb8de43de19d1a7ab5351f41e93 100644 (file)
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -1579,6 +1579,7 @@ class ConfigDictTest(BaseTest):
         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 @@ class ConfigDictTest(BaseTest):
             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 @@ class ConfigDictTest(BaseTest):
                 ('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")