summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles-François Natali <cf.natali@gmail.com>2013-01-13 13:12:35 (GMT)
committerCharles-François Natali <cf.natali@gmail.com>2013-01-13 13:12:35 (GMT)
commitadbfcb83a23d9154ef68a45e70d7fc00655f0224 (patch)
tree9ee039d277350ae9891fc426fbe040f62bd0b1ef
parentfa3965ab767bc85375634561cf9e4acf22eba5f2 (diff)
parentc78de46912c29a9cca58b90535a31a2656ca6ab4 (diff)
downloadcpython-adbfcb83a23d9154ef68a45e70d7fc00655f0224.zip
cpython-adbfcb83a23d9154ef68a45e70d7fc00655f0224.tar.gz
cpython-adbfcb83a23d9154ef68a45e70d7fc00655f0224.tar.bz2
test_asyncore: wait explicitly for a thread termination (this dangling thread
could be the cause of a random failure).
-rw-r--r--Lib/test/test_asyncore.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py
index 19b902b..57eb4fa 100644
--- a/Lib/test/test_asyncore.py
+++ b/Lib/test/test_asyncore.py
@@ -789,7 +789,7 @@ class BaseTestAPI:
t = threading.Thread(target=lambda: asyncore.loop(timeout=0.1,
count=500))
t.start()
-
+ self.addCleanup(t.join)
s = socket.socket(self.family, socket.SOCK_STREAM)
s.settimeout(.2)