changeset:   95122:1aad901e0307
parent:      95120:9202ea0b1bb8
parent:      95121:9eb1ce7d8039
user:        Ned Deily <nad@acm.org>
date:        Sun Mar 22 01:19:10 2015 -0700
files:       Lib/test/support/__init__.py Misc/NEWS
description:
Issue #22289: merge from 3.4


diff -r 9202ea0b1bb8 -r 1aad901e0307 Lib/test/support/__init__.py
--- a/Lib/test/support/__init__.py	Sun Mar 22 09:47:20 2015 +0200
+++ b/Lib/test/support/__init__.py	Sun Mar 22 01:19:10 2015 -0700
@@ -1328,7 +1328,8 @@
             (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 -r 9202ea0b1bb8 -r 1aad901e0307 Misc/NEWS
--- a/Misc/NEWS	Sun Mar 22 09:47:20 2015 +0200
+++ b/Misc/NEWS	Sun Mar 22 01:19:10 2015 -0700
@@ -104,6 +104,11 @@
 
 - Issue #23585: make patchcheck will ensure the interpreter is built.
 
+Tests
+-----
+
+- Issue #22289: Prevent test_urllib2net failures due to ftp connection timeout.
+
 Tools/Demos
 -----------