[Python-checkins] r75122 - in python/branches/release26-maint: Lib/test/test_urllib2_localnet.py
r.david.murray
python-checkins at python.org
Mon Sep 28 21:53:25 CEST 2009
Author: r.david.murray
Date: Mon Sep 28 21:53:25 2009
New Revision: 75122
Log:
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.
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Lib/test/test_urllib2_localnet.py
Modified: python/branches/release26-maint/Lib/test/test_urllib2_localnet.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_urllib2_localnet.py (original)
+++ python/branches/release26-maint/Lib/test/test_urllib2_localnet.py Mon Sep 28 21:53:25 2009
@@ -467,14 +467,24 @@
# 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():
More information about the Python-checkins
mailing list