From: Neal Norwitz <nnorwitz@gmail.com>
Date: Mon, 31 Mar 2008 05:39:26 +0000 (+0000)
Subject: This was required on OS X to prevent the test from deadlocking.  I'm not sure
X-Git-Tag: v3.0a4~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9ff5f02d46e27f3d9537d8e4f3a38686b2fd741;p=thirdparty%2FPython%2Fcpython.git

This was required on OS X to prevent the test from deadlocking.  I'm not sure
if this is just a test problem or something deeper.  Hopefully the test will
stop hanging.
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 0bd43920d184..520f440d2ab7 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -417,6 +417,7 @@ else:
                     except:
                         sys.stdout.write(''.join(traceback.format_exception(*sys.exc_info())))
                         break
+                    time.sleep(0.1)
 
             def server_close(self):
                 # Again, we want this to run in a thread, so we need to override
@@ -970,7 +971,11 @@ else:
                     raise test_support.TestFailed(
                         "Couldn't fetch data from HTTPS server")
             finally:
+                if test_support.verbose:
+                    sys.stdout.write('stopping server\n')
                 server.stop()
+                if test_support.verbose:
+                    sys.stdout.write('joining thread\n')
                 server.join()
 
         def testAsyncoreServer(self):