summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-09-07 21:46:05 +0000
committerAntoine Pitrou <solipsis@pitrou.net>2010-09-07 21:46:05 +0000
commit286b8332d930d8b0a7825b8a26a26cd896e09caf (patch)
treeb0e9e3ef5d7096a893da46bc78afa7ab5f765cbc
parentc818ed4d61b12a702b2af813cd0ac4839faf497f (diff)
downloadcpython-git-286b8332d930d8b0a7825b8a26a26cd896e09caf.tar.gz
Merged revisions 84604 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84604 | antoine.pitrou | 2010-09-07 23:43:31 +0200 (mar., 07 sept. 2010) | 3 lines Also catch some gaierrors ........
-rw-r--r--Lib/test/test_support.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 32ff970f7d..744b9d5927 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -760,16 +760,25 @@ def transient_internet(resource_name, timeout=30.0, errnos=()):
('ENETUNREACH', 101),
('ETIMEDOUT', 110),
]
+ default_gai_errnos = [
+ ('EAI_NONAME', -2),
+ ('EAI_NODATA', -5),
+ ]
denied = ResourceDenied("Resource '%s' is not available" % resource_name)
captured_errnos = errnos
+ gai_errnos = []
if not captured_errnos:
captured_errnos = [getattr(errno, name, num)
for (name, num) in default_errnos]
+ gai_errnos = [getattr(socket, name, num)
+ for (name, num) in default_gai_errnos]
def filter_error(err):
+ n = getattr(err, 'errno', None)
if (isinstance(err, socket.timeout) or
- getattr(err, 'errno', None) in captured_errnos):
+ (isinstance(err, socket.gaierror) and n in gai_errnos) or
+ n in captured_errnos):
if not verbose:
sys.stderr.write(denied.args[0] + "\n")
raise denied