summaryrefslogtreecommitdiffstats
path: root/Lib/test/support
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2015-03-02 04:01:37 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2015-03-02 04:01:37 (GMT)
commitfc080fcc7cb4bcb08b076e819fe6e7aadc2a1c13 (patch)
tree2417a7c8540b2af44f65ae720a93bd8b60d1d30f /Lib/test/support
parentf2d4e5773a5fb2e6e58ad758ba5266fe82a86edf (diff)
parentbcdfc6a1fa9eabb06b886a82218ebae3384784d0 (diff)
downloadcpython-fc080fcc7cb4bcb08b076e819fe6e7aadc2a1c13.zip
cpython-fc080fcc7cb4bcb08b076e819fe6e7aadc2a1c13.tar.gz
cpython-fc080fcc7cb4bcb08b076e819fe6e7aadc2a1c13.tar.bz2
Issue #23387: Skip test_issue16464 if it raises an 5xx error.
Also, remove support.run_doctest() since there is no doctests in test_urllib2 and urllib.request.
Diffstat (limited to 'Lib/test/support')
-rw-r--r--Lib/test/support/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 7bfa12c..0ef2e8a 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -1325,6 +1325,8 @@ def transient_internet(resource_name, *, timeout=30.0, errnos=()):
n = getattr(err, 'errno', None)
if (isinstance(err, socket.timeout) or
(isinstance(err, socket.gaierror) and n in gai_errnos) or
+ (isinstance(err, urllib.error.HTTPError) and
+ 500 <= err.code <= 599) or
(isinstance(err, urllib.error.URLError) and
"ConnectionRefusedError" in err.reason) or
n in captured_errnos):