summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_logging.py
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2010-02-05 23:43:11 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2010-02-05 23:43:11 (GMT)
commit2373926964b799a7d8346169feb8fbbf7f2f8a65 (patch)
tree08568296161e1238cfc2cfd60507dbf440e9dc4c /Lib/test/test_logging.py
parentba7732ea6a1383d1756ee3aaa885f68ce60cd3f8 (diff)
downloadcpython-2373926964b799a7d8346169feb8fbbf7f2f8a65.zip
cpython-2373926964b799a7d8346169feb8fbbf7f2f8a65.tar.gz
cpython-2373926964b799a7d8346169feb8fbbf7f2f8a65.tar.bz2
test_logging: minor tweaks to timeouts, listening tests marked as skipped.
Diffstat (limited to 'Lib/test/test_logging.py')
-rw-r--r--Lib/test/test_logging.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 43a4438..8cbc060 100644
--- 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")