summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2010-02-06 20:28:36 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2010-02-06 20:28:36 (GMT)
commit7f22443d94d7a87f3b146832a55ec3595c954a47 (patch)
tree7498b7f752008c10cbf2c99c78316d7870e5c28d /Lib/test
parent42d5947ef5263c8227e37050ff801131992bcb90 (diff)
downloadcpython-7f22443d94d7a87f3b146832a55ec3595c954a47.zip
cpython-7f22443d94d7a87f3b146832a55ec3595c954a47.tar.gz
cpython-7f22443d94d7a87f3b146832a55ec3595c954a47.tar.bz2
Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_logging.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 511d3c4..092bd41 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -1577,6 +1577,7 @@ class ConfigDictTest(BaseTest):
port = find_unused_port()
t = logging.config.listen(port)
t.start()
+ time.sleep(0.5) # give server thread some time to get ready
try:
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.settimeout(2.0)
@@ -1615,7 +1616,7 @@ class ConfigDictTest(BaseTest):
('ERROR', '4'),
], stream=output)
- @unittest.skip("See issue #7857")
+ #@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))