From: Martin Panter <vadmium+py@gmail.com>
Date: Sat, 22 Oct 2016 01:42:06 +0000 (+0000)
Subject: Issue #28435: Avoid no_proxy environment variable interfering with tests
X-Git-Tag: v3.6.0b3~74^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1002a621c1f0c8d5adcdd6462b9bdd0470e34290;p=thirdparty%2FPython%2Fcpython.git

Issue #28435: Avoid no_proxy environment variable interfering with tests

Patch by Piotr Szczepaniak.
---

diff --git a/Lib/test/test_urllib2_localnet.py b/Lib/test/test_urllib2_localnet.py
index e9564fde621a..68c523abbc0c 100644
--- a/Lib/test/test_urllib2_localnet.py
+++ b/Lib/test/test_urllib2_localnet.py
@@ -323,6 +323,14 @@ class ProxyAuthTests(unittest.TestCase):
 
     def setUp(self):
         super(ProxyAuthTests, self).setUp()
+        # Ignore proxy bypass settings in the environment.
+        def restore_environ(old_environ):
+            os.environ.clear()
+            os.environ.update(old_environ)
+        self.addCleanup(restore_environ, os.environ.copy())
+        os.environ['NO_PROXY'] = ''
+        os.environ['no_proxy'] = ''
+
         self.digest_auth_handler = DigestAuthHandler()
         self.digest_auth_handler.set_users({self.USER: self.PASSWD})
         self.digest_auth_handler.set_realm(self.REALM)
@@ -445,6 +453,7 @@ class TestUrlopen(unittest.TestCase):
             os.environ.update(old_environ)
         self.addCleanup(restore_environ, os.environ.copy())
         os.environ['NO_PROXY'] = '*'
+        os.environ['no_proxy'] = '*'
 
     def urlopen(self, url, data=None, **kwargs):
         l = []
diff --git a/Misc/ACKS b/Misc/ACKS
index d35f1e891663..8c5c0c203ff0 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1450,6 +1450,7 @@ Al Sweigart
 Thenault Sylvain
 Péter Szabó
 John Szakmeister
+Piotr Szczepaniak
 Amir Szekely
 Maciej Szulik
 Arfrever Frehtes Taifersar Arahesis