Manual backport of r54233. This will help prevent spurious Buildbot failures
by HTTPS connections that time out.
diff --git a/Lib/test/test_socket_ssl.py b/Lib/test/test_socket_ssl.py
index 3c9c9f0..ae6e1da 100644
--- a/Lib/test/test_socket_ssl.py
+++ b/Lib/test/test_socket_ssl.py
@@ -27,7 +27,13 @@
print "didn't raise TypeError"
socket.RAND_add("this is a random string", 75.0)
- f = urllib.urlopen('https://sf.net')
+ try:
+ f = urllib.urlopen('https://sf.net')
+ except IOError, exc:
+ if exc.errno == errno.ETIMEDOUT:
+ raise test_support.ResourceDenied('HTTPS connection is timing out')
+ else:
+ raise
buf = f.read()
f.close()
diff --git a/Misc/NEWS b/Misc/NEWS
index 1ea4916..525c9bd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -356,6 +356,9 @@
Tests
-----
+- Cause test.test_socket_ssl:test_basic to raise
+ test.test_support.ResourceDenied when an HTTPS connection times out.
+
- Remove passwd.adjunct.byname from list of maps
for test_nis.