[Python-checkins] cpython (merge 3.3 -> default): Merge: #20933: At least one place maps 'test' to 'localhost'...fix test.

[r.david.murray]

http://hg.python.org/cpython/rev/586de8d96817
changeset:   89664:586de8d96817
parent:      89662:7ce22d0899e4
parent:      89663:6a78bbd0fda4
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Mar 15 12:03:02 2014 -0400
summary:
  Merge: #20933: At least one place maps 'test' to 'localhost'...fix test.

files:
  Lib/test/test_urllib2.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -1227,7 +1227,8 @@
             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)
 

-- 
Repository URL: http://hg.python.org/cpython