summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_asyncore.py
diff options
context:
space:
mode:
authorEli Bendersky <eliben@gmail.com>2013-01-13 13:17:19 (GMT)
committerEli Bendersky <eliben@gmail.com>2013-01-13 13:17:19 (GMT)
commit253a843f15e0682c74b72f7b2fe9766ffe6d47b1 (patch)
treea90e3730b5c015d614b93e1dab9a265bc36d63ac /Lib/test/test_asyncore.py
parent45839901433c874fdcea15f6492d72fb8687b54e (diff)
parentc78de46912c29a9cca58b90535a31a2656ca6ab4 (diff)
downloadcpython-253a843f15e0682c74b72f7b2fe9766ffe6d47b1.zip
cpython-253a843f15e0682c74b72f7b2fe9766ffe6d47b1.tar.gz
cpython-253a843f15e0682c74b72f7b2fe9766ffe6d47b1.tar.bz2
merge heads
Diffstat (limited to 'Lib/test/test_asyncore.py')
-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 4ae16eb..878b26c 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)