[Python-checkins] cpython (merge 3.2 -> default): Fix intermittent test_ssl failure.

[antoine.pitrou]

http://hg.python.org/cpython/rev/b99c54acb22d
changeset:   74660:b99c54acb22d
parent:      74657:26612ad451ad
parent:      74659:76d60fcef3db
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Fri Jan 27 17:34:56 2012 +0100
summary:
  Fix intermittent test_ssl failure.

files:
  Lib/test/test_ssl.py |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1032,6 +1032,7 @@
                                          + repr(connaddr) + '\n')
                     handler = self.ConnectionHandler(self, newconn, connaddr)
                     handler.start()
+                    handler.join()
                 except socket.timeout:
                     pass
                 except KeyboardInterrupt:

-- 
Repository URL: http://hg.python.org/cpython