summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-01-27 16:34:56 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-01-27 16:34:56 (GMT)
commit6636887104bb3ebe180682a8ce10fee8fbc0c46e (patch)
treeb61a4fdde368ebc64d392fe3df68af9d55de89d6
parentbc9f1b5a146a599bde8245ad80edadedecb8ae25 (diff)
parenteced82ecbfa8a1e381ee1bf40310968c10fd85dc (diff)
downloadcpython-6636887104bb3ebe180682a8ce10fee8fbc0c46e.zip
cpython-6636887104bb3ebe180682a8ce10fee8fbc0c46e.tar.gz
cpython-6636887104bb3ebe180682a8ce10fee8fbc0c46e.tar.bz2
Fix intermittent test_ssl failure.
-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 86d1cd8..6439441 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1032,6 +1032,7 @@ else:
+ repr(connaddr) + '\n')
handler = self.ConnectionHandler(self, newconn, connaddr)
handler.start()
+ handler.join()
except socket.timeout:
pass
except KeyboardInterrupt: