1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #22596: support.transient_internet() now also catches

Browse Source 
ConnectionRefusedError exceptions wrapped by urllib.error.URLError.

This change should fix sporadic failures in test_urllib2net.
This commit is contained in:
Berker Peksag 2014-10-25 05:42:30 +03:00
parent 6d1c149a46
commit 8b63d3af9f
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/support/__init__.py
View File

@ -25,6 +25,7 @@ import sysconfig
import tempfile import tempfile
import time import time
import unittest import unittest
import urllib.error
import warnings import warnings
try: try:
@ -1307,6 +1308,8 @@ def transient_internet(resource_name, *, timeout=30.0, errnos=()):
n = getattr(err, 'errno', None) n = getattr(err, 'errno', None)
if (isinstance(err, socket.timeout) or if (isinstance(err, socket.timeout) or
(isinstance(err, socket.gaierror) and n in gai_errnos) or (isinstance(err, socket.gaierror) and n in gai_errnos) or
(isinstance(err, urllib.error.URLError) and
"ConnectionRefusedError" in err.reason) or
n in captured_errnos): n in captured_errnos):
if not verbose: if not verbose:
sys.stderr.write(denied.args[0] + "\n") sys.stderr.write(denied.args[0] + "\n")

7
Lib/test/test_urllib2net.py
View File

@ -229,6 +229,7 @@ class OtherNetworkTests(unittest.TestCase):
with support.transient_internet(url): with support.transient_internet(url):
try: try:
f = urlopen(url, req, TIMEOUT) f = urlopen(url, req, TIMEOUT)
# urllib.error.URLError is a subclass of OSError
except OSError as err: except OSError as err:
if expected_err: if expected_err:
msg = ("Didn't get expected error(s) %s for %s %s, got %s: %s" % msg = ("Didn't get expected error(s) %s for %s %s, got %s: %s" %
@ -236,12 +237,6 @@ class OtherNetworkTests(unittest.TestCase):
self.assertIsInstance(err, expected_err, msg) self.assertIsInstance(err, expected_err, msg)
else: else:
raise raise
except urllib.error.URLError as err:
if isinstance(err[0], socket.timeout):
print("<timeout: %s>" % url, file=sys.stderr)
continue
else:
raise
else: else:
try: try:
with support.time_out, \ with support.time_out, \