Issue #22289: merge from 3.4

2024-09-19 20:51:48 +00:00 · 2015-03-22 01:19:10 -07:00 · 2015-03-22 01:19:10 -07:00 · 2f7bf23925
parent 8472f39b06 ce8f5ded65
commit 2f7bf23925
2 changed files with 7 additions and 1 deletions
--- a/Lib/test/support/init.py
+++ b/Lib/test/support/init.py
@ -1328,7 +1328,8 @@ def filter_error(err):
            (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")
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -104,6 +104,11 @@ Build

 - Issue #23585: make patchcheck will ensure the interpreter is built.

+Tests
+-----
+
+- Issue #22289: Prevent test_urllib2net failures due to ftp connection timeout.
+
 Tools/Demos
 -----------