Index: Lib/test/test_urllib2net.py =================================================================== --- Lib/test/test_urllib2net.py (révision 80207) +++ Lib/test/test_urllib2net.py (copie de travail) @@ -7,8 +7,11 @@ import socket import urllib2 import os +import sys +TIMEOUT = 60 # seconds + def _retry_thrice(func, exc, *args, **kwargs): for i in range(3): try: @@ -167,16 +170,25 @@ req = expected_err = None debug(url) try: - f = urlopen(url, req) + f = urlopen(url, req, TIMEOUT) except EnvironmentError, 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 urllib2.URLError as err: + if isinstance(err[0], timeout): + print >>sys.stderr, "" % url + continue + else: + raise else: - with test_support.transient_internet(): - buf = f.read() + try: + with test_support.transient_internet(): + buf = f.read() + except socket.timeout: + print >>sys.stderr, "" % url f.close() debug("read %d bytes" % len(buf)) debug("******** next url coming up...")