summaryrefslogtreecommitdiffstats
path: root/Lib/test/support
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2015-03-22 08:14:48 (GMT)
committerNed Deily <nad@acm.org>2015-03-22 08:14:48 (GMT)
commitce8f5ded651eb934e7aa31391b6459bce4c56edc (patch)
tree9c3a955d1f53d337b6c68b4418a024178548c7e3 /Lib/test/support
parentd357b89f0bf3de2957e93ea5aa6ead5e50d30930 (diff)
downloadcpython-ce8f5ded651eb934e7aa31391b6459bce4c56edc.zip
cpython-ce8f5ded651eb934e7aa31391b6459bce4c56edc.tar.gz
cpython-ce8f5ded651eb934e7aa31391b6459bce4c56edc.tar.bz2
Issue #22289: Prevent test_urllib2net failures due to ftp connection timeout.
Diffstat (limited to 'Lib/test/support')
-rw-r--r--Lib/test/support/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index d223242..94a5858 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -1327,7 +1327,8 @@ def transient_internet(resource_name, *, timeout=30.0, errnos=()):
(isinstance(err, urllib.error.HTTPError) and
500 <= err.code <= 599) or
(isinstance(err, urllib.error.URLError) and
- "ConnectionRefusedError" in err.reason) or
+ (("ConnectionRefusedError" in err.reason) or
+ ("TimeoutError" in err.reason))) or
n in captured_errnos):
if not verbose:
sys.stderr.write(denied.args[0] + "\n")