summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_socket_ssl.py
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2007-03-08 23:58:11 (GMT)
committerBrett Cannon <bcannon@gmail.com>2007-03-08 23:58:11 (GMT)
commita30fcb4dae51705f182383a6ad5f3fb86a80f9fb (patch)
treed704230a35802a5f1a745becf7b62acecfe377df /Lib/test/test_socket_ssl.py
parent9b2a10954037b30851322fac794ce098118f4f42 (diff)
downloadcpython-a30fcb4dae51705f182383a6ad5f3fb86a80f9fb.zip
cpython-a30fcb4dae51705f182383a6ad5f3fb86a80f9fb.tar.gz
cpython-a30fcb4dae51705f182383a6ad5f3fb86a80f9fb.tar.bz2
Introduce test.test_support.TransientResource. It's a context manager to
surround calls to resources that may or may not be available. Specifying the expected exception and attributes to be raised if the resource is not available prevents overly broad catching of exceptions. This is meant to help suppress spurious failures by raising test.test_support.ResourceDenied if the exception matches. It would probably be good to go through the various network tests and surround the calls to catch connection timeouts (as done with test_socket_ssl in this commit).
Diffstat (limited to 'Lib/test/test_socket_ssl.py')
-rw-r--r--Lib/test/test_socket_ssl.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_socket_ssl.py b/Lib/test/test_socket_ssl.py
index 3c9c9f0..8fb7e4c 100644
--- a/Lib/test/test_socket_ssl.py
+++ b/Lib/test/test_socket_ssl.py
@@ -27,7 +27,8 @@ def test_basic():
print "didn't raise TypeError"
socket.RAND_add("this is a random string", 75.0)
- f = urllib.urlopen('https://sf.net')
+ with test_support.TransientResource(IOError, errno=errno.ETIMEDOUT):
+ f = urllib.urlopen('https://sf.net')
buf = f.read()
f.close()