diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-29 23:33:46 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-29 23:33:46 (GMT) |
| commit | 8c0fc15c411b577f310613e23724e985f1d2cf73 (patch) | |
| tree | 9835cb2593b20b40919253384fd3c5f461feb4a3 | |
| parent | 04cc55a14c0cc5a55b573fde2194f554d1105c6a (diff) | |
| parent | 9098472299a18471f29b3ed471376be2d29178be (diff) | |
| download | cpython-8c0fc15c411b577f310613e23724e985f1d2cf73.zip cpython-8c0fc15c411b577f310613e23724e985f1d2cf73.tar.gz cpython-8c0fc15c411b577f310613e23724e985f1d2cf73.tar.bz2 | |
#17564: merge with 3.3.
| -rw-r--r-- | 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 index 5880b3a..08250c3 100644 --- a/Lib/test/test_urllib2_localnet.py +++ b/Lib/test/test_urllib2_localnet.py @@ -546,6 +546,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(OSError, # Given that both VeriSign and various ISPs have in # the past or are presently hijacking various invalid |