From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 29 Mar 2013 23:28:40 +0000 (+0200)
Subject: #17564: skip test_bad_address unless the tests are run with -unetwork/-uall.
X-Git-Tag: v3.3.2~192
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9098472299a18471f29b3ed471376be2d29178be;p=thirdparty%2FPython%2Fcpython.git

#17564: skip test_bad_address unless the tests are run with -unetwork/-uall.
---

diff --git a/Lib/test/test_urllib2_localnet.py b/Lib/test/test_urllib2_localnet.py
index 1eba14bacb5e..b1aa1584553c 100644
--- a/Lib/test/test_urllib2_localnet.py
+++ b/Lib/test/test_urllib2_localnet.py
@@ -524,6 +524,11 @@ class TestUrlopen(unittest.TestCase):
     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(IOError,
                           # Given that both VeriSign and various ISPs have in
                           # the past or are presently hijacking various invalid