summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2014-03-15 16:00:14 (GMT)
committerR David Murray <rdmurray@bitdance.com>2014-03-15 16:00:14 (GMT)
commitfdbe918eb0c0b1c3b812ccdfa49c7bd7d44099b7 (patch)
tree1c10ca7aeef304e5332c41ec9480c087b1d3a132
parentef87f8cb57e147b48665c06b41ac10b5cf4904c4 (diff)
downloadcpython-fdbe918eb0c0b1c3b812ccdfa49c7bd7d44099b7.zip
cpython-fdbe918eb0c0b1c3b812ccdfa49c7bd7d44099b7.tar.gz
cpython-fdbe918eb0c0b1c3b812ccdfa49c7bd7d44099b7.tar.bz2
#20933: At least one place maps 'test' to 'localhost'...fix test.
Discovery and patch by Wenzhu Man. University of Waterloo apparently maps the local name 'test' to localhost, which is in the bypass list, causing the test to fail. So change 'test' to a name unlikely to get mapped to localhost.
-rw-r--r--Lib/test/test_urllib2.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 3559b1b..d069139 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -1209,7 +1209,8 @@ class HandlerTests(unittest.TestCase):
self.assertTrue(_proxy_bypass_macosx_sysconf(host, bypass),
'expected bypass of %s to be True' % host)
# Check hosts that should not trigger the proxy bypass
- for host in ('abc.foo.bar', 'bar.com', '127.0.0.2', '10.11.0.1', 'test'):
+ for host in ('abc.foo.bar', 'bar.com', '127.0.0.2', '10.11.0.1',
+ 'notinbypass'):
self.assertFalse(_proxy_bypass_macosx_sysconf(host, bypass),
'expected bypass of %s to be False' % host)