summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2010-02-08 16:05:50 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2010-02-08 16:05:50 (GMT)
commit9a164ac800aab859ebea10193f99642bbb42eed3 (patch)
tree2c1b44fd73f990f0f5f6bebe47893cb3dcf6bf0c /Lib
parente1ec841086c2e99fea818cfbc1deab3c224d0f31 (diff)
downloadcpython-9a164ac800aab859ebea10193f99642bbb42eed3.zip
cpython-9a164ac800aab859ebea10193f99642bbb42eed3.tar.gz
cpython-9a164ac800aab859ebea10193f99642bbb42eed3.tar.bz2
Issue #7857: Another attempt to keep the buildbots happy.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_logging.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 1d3bd1a..77db96a 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -1574,6 +1574,7 @@ class ConfigDictTest(BaseTest):
t = logging.config.listen(port)
t.start()
t.ready.wait()
+ t.ready.clear()
try:
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.settimeout(2.0)
@@ -1589,10 +1590,11 @@ class ConfigDictTest(BaseTest):
left -= sent
sock.close()
finally:
+ t.ready.wait(2.0)
logging.config.stopListening()
t.join(2.0)
- @unittest.skip("See issue #7857")
+ #@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))