changeset:   95121:9eb1ce7d8039
branch:      3.4
parent:      95119:57a457ea84e4
user:        Ned Deily <nad@acm.org>
date:        Sun Mar 22 01:14:48 2015 -0700
files:       Lib/test/support/__init__.py Misc/NEWS
description:
Issue #22289: Prevent test_urllib2net failures due to ftp connection timeout.


diff -r 57a457ea84e4 -r 9eb1ce7d8039 Lib/test/support/__init__.py
--- a/Lib/test/support/__init__.py	Sun Mar 22 09:46:36 2015 +0200
+++ b/Lib/test/support/__init__.py	Sun Mar 22 01:14:48 2015 -0700
@@ -1327,7 +1327,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 57a457ea84e4 -r 9eb1ce7d8039 Misc/NEWS
--- a/Misc/NEWS	Sun Mar 22 09:46:36 2015 +0200
+++ b/Misc/NEWS	Sun Mar 22 01:14:48 2015 -0700
@@ -455,6 +455,8 @@
 - 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
 -----