]> granicus.if.org Git - python/commitdiff
#17564: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 29 Mar 2013 23:33:46 +0000 (01:33 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 29 Mar 2013 23:33:46 +0000 (01:33 +0200)
1  2 
Lib/test/test_urllib2_localnet.py

index 5880b3ab75943d13bb28cafd9c5cf7026a52199e,b1aa1584553c835136445979eda7e6567d1321f1..08250c36e5d6a9b20e12789e4030e315e4770882
@@@ -546,7 -524,12 +546,12 @@@ class TestUrlopen(unittest.TestCase)
      def test_bad_address(self):
          # Make sure proper exception is raised when connecting to a bogus
          # address.
 -        self.assertRaises(IOError,
+         # 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
                            # domain name requests in an attempt to boost traffic