summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2008-03-31 05:39:26 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2008-03-31 05:39:26 (GMT)
commitf9ff5f02d46e27f3d9537d8e4f3a38686b2fd741 (patch)
tree779247d8fe784485945d17804347f786721bbf5e /Lib
parentee9b10a9872244df1ad576f3e398ad959bbab0fc (diff)
downloadcpython-f9ff5f02d46e27f3d9537d8e4f3a38686b2fd741.zip
cpython-f9ff5f02d46e27f3d9537d8e4f3a38686b2fd741.tar.gz
cpython-f9ff5f02d46e27f3d9537d8e4f3a38686b2fd741.tar.bz2
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.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_ssl.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 0bd4392..520f440 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):