summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-09-28 19:53:25 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-09-28 19:53:25 (GMT)
commita89633c4f7566193cf6ac4be9219672e7f7abc9d (patch)
tree4a25a9de17b911a756cb6be27d08a67b852fdb06 /Lib
parente4829f1d7772597e77ef83d4285c5f465121a99f (diff)
downloadcpython-a89633c4f7566193cf6ac4be9219672e7f7abc9d.zip
cpython-a89633c4f7566193cf6ac4be9219672e7f7abc9d.tar.gz
cpython-a89633c4f7566193cf6ac4be9219672e7f7abc9d.tar.bz2
Merged revisions 75111 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r75111 | r.david.murray | 2009-09-28 12:57:45 -0400 (Mon, 28 Sep 2009) | 5 lines Prevent test_bad_address failure when a domain in the dns search path implements a '*' default rule. Also update comment with a more complete explanation of the difficulties inherent in the test. ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_urllib2_localnet.py26
1 files changed, 18 insertions, 8 deletions
diff --git a/Lib/test/test_urllib2_localnet.py b/Lib/test/test_urllib2_localnet.py
index 9920134..8ae01b6 100644
--- a/Lib/test/test_urllib2_localnet.py
+++ b/Lib/test/test_urllib2_localnet.py
@@ -467,14 +467,24 @@ class TestUrlopen(unittest.TestCase):
# Make sure proper exception is raised when connecting to a bogus
# address.
self.assertRaises(IOError,
- # SF patch 809915: In Sep 2003, VeriSign started
- # highjacking invalid .com and .net addresses to
- # boost traffic to their own site. This test
- # started failing then. One hopes the .invalid
- # domain will be spared to serve its defined
- # purpose.
- # urllib2.urlopen, "http://www.sadflkjsasadf.com/")
- urllib2.urlopen, "http://sadflkjsasf.i.nvali.d/")
+ # 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
+ # to their own sites, finding a domain name to use
+ # for this test is difficult. RFC2606 leads one to
+ # believe that '.invalid' should work, but experience
+ # seemed to indicate otherwise. Single character
+ # TLDs are likely to remain invalid, so this seems to
+ # be the best choice. The trailing '.' prevents a
+ # related problem: The normal DNS resolver appends
+ # the domain names from the search path if there is
+ # no '.' the end and, and if one of those domains
+ # implements a '*' rule a result is returned.
+ # However, none of this will prevent the test from
+ # failing if the ISP hijacks all invalid domain
+ # requests. The real solution would be to be able to
+ # parameterize the framework with a mock resolver.
+ urllib2.urlopen, "http://sadflkjsasf.i.nvali.d./")
def test_main():