summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_ssl.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-01-27 16:33:01 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-01-27 16:33:01 (GMT)
commit7a556846d40021de1102852b9fedc5e1ca808de9 (patch)
tree572f6ef0d577bf5bdb3dfad4a3aaa9beee2be689 /Lib/test/test_ssl.py
parent78028b0589597365f354c0b183a1cf9d294e0237 (diff)
downloadcpython-7a556846d40021de1102852b9fedc5e1ca808de9.zip
cpython-7a556846d40021de1102852b9fedc5e1ca808de9.tar.gz
cpython-7a556846d40021de1102852b9fedc5e1ca808de9.tar.bz2
Fix intermittent test_ssl failure.
Diffstat (limited to 'Lib/test/test_ssl.py')
-rw-r--r--Lib/test/test_ssl.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index e64d1b2..97552e8 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -562,6 +562,7 @@ else:
+ str(connaddr) + '\n')
handler = self.ConnectionHandler(self, newconn)
handler.start()
+ handler.join()
except socket.timeout:
pass
except KeyboardInterrupt: