[Python-checkins] cpython (merge 3.3 -> default): #17564: merge with 3.3.

Sat Mar 30 00:33:59 CET 2013

http://hg.python.org/cpython/rev/ae5c4a9118b8
changeset: 83006:ae5c4a9118b8
parent: 83003:e097fe3a87de
parent: 83004:f668d2267303
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Sat Mar 30 01:33:46 2013 +0200
summary:
 #17564: merge with 3.3.
files:
 Lib/test/test_urllib2_localnet.py | 5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/Lib/test/test_urllib2_localnet.py b/Lib/test/test_urllib2_localnet.py
--- a/Lib/test/test_urllib2_localnet.py
+++ b/Lib/test/test_urllib2_localnet.py
@@ -546,6 +546,11 @@
 def test_bad_address(self):
 # Make sure proper exception is raised when connecting to a bogus
 # address.
+
+ # as indicated by the comment below, this might fail with some ISP,
+ # so we run the test only when -unetwork/-uall is specified to
+ # mitigate the problem a bit (see #17564)
+ support.requires('network')
 self.assertRaises(OSError,
 # Given that both VeriSign and various ISPs have in
 # the past or are presently hijacking various invalid
-- 
Repository URL: http://hg.python.org/cpython
