diff options
| author | Ned Deily <nad@acm.org> | 2015-03-22 08:19:10 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2015-03-22 08:19:10 (GMT) |
| commit | 2f7bf239259319b058f8a6f77f910930460ce038 (patch) | |
| tree | b33ec0765f0a44eed7f27ee1ca658c029b16aacd | |
| parent | 8472f39b06b5f5b96038e28874b4138e581de8c1 (diff) | |
| parent | ce8f5ded651eb934e7aa31391b6459bce4c56edc (diff) | |
| download | cpython-2f7bf239259319b058f8a6f77f910930460ce038.zip cpython-2f7bf239259319b058f8a6f77f910930460ce038.tar.gz cpython-2f7bf239259319b058f8a6f77f910930460ce038.tar.bz2 | |
Issue #22289: merge from 3.4
| -rw-r--r-- | Lib/test/support/__init__.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index 7ef6980..77e2d76 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -1328,7 +1328,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") @@ -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 ----------- |