From: Ned Deily Date: Sun, 22 Mar 2015 08:14:48 +0000 (-0700) Subject: Issue #22289: Prevent test_urllib2net failures due to ftp connection timeout. X-Git-Tag: v3.5.0a3~40^2~18 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce8f5ded651eb934e7aa31391b6459bce4c56edc;p=python Issue #22289: Prevent test_urllib2net failures due to ftp connection timeout. --- diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index d223242a20..94a5858a1d 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") diff --git a/Misc/NEWS b/Misc/NEWS index a4ebd72b48..46c3c0a66a 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -455,6 +455,8 @@ Tests - Issue #23345: Prevent test_ssl failures with large OpenSSL patch level values (like 0.9.8zc). +- Issue #22289: Prevent test_urllib2net failures due to ftp connection timeout. + Build -----