From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 27 Jan 2012 16:33:01 +0000 (+0100)
Subject: Fix intermittent test_ssl failure.
X-Git-Tag: v2.7.3rc1~118
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a556846d40021de1102852b9fedc5e1ca808de9;p=thirdparty%2FPython%2Fcpython.git

Fix intermittent test_ssl failure.
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index e64d1b22fa53..97552e8fdd6e 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: