[Python-checkins] r54236 - in python/branches/release25-maint: Lib/test/test_socket_ssl.py Misc/NEWS

brett.cannon python-checkins at python.org
Fri Mar 9 05:57:05 CET 2007


Author: brett.cannon
Date: Fri Mar  9 05:57:00 2007
New Revision: 54236

Modified:
   python/branches/release25-maint/Lib/test/test_socket_ssl.py
   python/branches/release25-maint/Misc/NEWS
Log:
Manual backport of r54233.  This will help prevent spurious Buildbot failures
by HTTPS connections that time out.


Modified: python/branches/release25-maint/Lib/test/test_socket_ssl.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_socket_ssl.py	(original)
+++ python/branches/release25-maint/Lib/test/test_socket_ssl.py	Fri Mar  9 05:57:00 2007
@@ -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()
 

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Fri Mar  9 05:57:00 2007
@@ -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.
 


More information about the Python-checkins mailing list