Merged revisions 80236 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80236 | senthil.kumaran | 2010-04-20 12:24:59 +0530 (Tue, 20 Apr 2010) | 3 lines
Fix Issue8460: Victor's patch to add timeout in test_urllib2net test_urls.
........
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index 1dea93f..ff7c7bf 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -8,6 +8,9 @@
import socket
import urllib.error
import urllib.request
+import sys
+
+TIMEOUT = 60 # seconds
def _retry_thrice(func, exc, *args, **kwargs):
@@ -162,20 +165,29 @@
req = expected_err = None
debug(url)
try:
- f = urlopen(url, req)
+ f = urlopen(url, req, TIMEOUT)
except EnvironmentError as err:
debug(err)
if expected_err:
msg = ("Didn't get expected error(s) %s for %s %s, got %s: %s" %
(expected_err, url, req, type(err), err))
self.assertIsInstance(err, expected_err, msg)
+ except urllib.error.URLError as err:
+ if isinstance(err[0], socket.timeout):
+ print("<timeout: %s>" % url, file=sys.stderr)
+ continue
+ else:
+ raise
else:
- with support.time_out, \
- support.socket_peer_reset, \
- support.ioerror_peer_reset:
- buf = f.read()
+ try:
+ with support.time_out, \
+ support.socket_peer_reset, \
+ support.ioerror_peer_reset:
+ buf = f.read()
+ debug("read %d bytes" % len(buf))
+ except socket.timeout:
+ print("<timeout: %s>" % url, file=sys.stderr)
f.close()
- debug("read %d bytes" % len(buf))
debug("******** next url coming up...")
time.sleep(0.1)