gh-127591: Fix altering environment in test_urllib2 (unsetting no_proxy) (GH-132584)
This commit is contained in:
parent
8cb177d09b
commit
8b7cb947c5
@ -1446,7 +1446,8 @@ class HandlerTests(unittest.TestCase):
|
|||||||
[tup[0:2] for tup in o.calls])
|
[tup[0:2] for tup in o.calls])
|
||||||
|
|
||||||
def test_proxy_no_proxy(self):
|
def test_proxy_no_proxy(self):
|
||||||
os.environ['no_proxy'] = 'python.org'
|
env = self.enterContext(os_helper.EnvironmentVarGuard())
|
||||||
|
env['no_proxy'] = 'python.org'
|
||||||
o = OpenerDirector()
|
o = OpenerDirector()
|
||||||
ph = urllib.request.ProxyHandler(dict(http="proxy.example.com"))
|
ph = urllib.request.ProxyHandler(dict(http="proxy.example.com"))
|
||||||
o.add_handler(ph)
|
o.add_handler(ph)
|
||||||
@ -1458,10 +1459,10 @@ class HandlerTests(unittest.TestCase):
|
|||||||
self.assertEqual(req.host, "www.python.org")
|
self.assertEqual(req.host, "www.python.org")
|
||||||
o.open(req)
|
o.open(req)
|
||||||
self.assertEqual(req.host, "www.python.org")
|
self.assertEqual(req.host, "www.python.org")
|
||||||
del os.environ['no_proxy']
|
|
||||||
|
|
||||||
def test_proxy_no_proxy_all(self):
|
def test_proxy_no_proxy_all(self):
|
||||||
os.environ['no_proxy'] = '*'
|
env = self.enterContext(os_helper.EnvironmentVarGuard())
|
||||||
|
env['no_proxy'] = '*'
|
||||||
o = OpenerDirector()
|
o = OpenerDirector()
|
||||||
ph = urllib.request.ProxyHandler(dict(http="proxy.example.com"))
|
ph = urllib.request.ProxyHandler(dict(http="proxy.example.com"))
|
||||||
o.add_handler(ph)
|
o.add_handler(ph)
|
||||||
@ -1469,7 +1470,6 @@ class HandlerTests(unittest.TestCase):
|
|||||||
self.assertEqual(req.host, "www.python.org")
|
self.assertEqual(req.host, "www.python.org")
|
||||||
o.open(req)
|
o.open(req)
|
||||||
self.assertEqual(req.host, "www.python.org")
|
self.assertEqual(req.host, "www.python.org")
|
||||||
del os.environ['no_proxy']
|
|
||||||
|
|
||||||
def test_proxy_https(self):
|
def test_proxy_https(self):
|
||||||
o = OpenerDirector()
|
o = OpenerDirector()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user