1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
From: Olivier Gayot <olivier.gayot@canonical.com>
Date: Thu, 13 Jun 2024 09:56:35 +0100
Subject: Fix autopkgtest when HTTP/HTTPS proxy is set
The pytest suite does not expect the http_proxy, https_proxy and no_proxy
variables to be present in the environment. They make pytest fail and
therefore autopkgtest fail as well.
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/requests/+bug/1974182
Forwarded: no
Last-Update: 2022-05-19
---
tests/test_requests.py | 15 ++++++++-------
tests/utils.py | 3 ++-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/tests/test_requests.py b/tests/test_requests.py
index 75d2def..120f2fc 100644
--- a/tests/test_requests.py
+++ b/tests/test_requests.py
@@ -581,8 +581,9 @@ class TestRequests:
),
)
def test_errors(self, url, exception):
- with pytest.raises(exception):
- requests.get(url, timeout=1)
+ with override_environ(http_proxy=None, https_proxy=None):
+ with pytest.raises(exception):
+ requests.get(url, timeout=1)
def test_proxy_error(self):
# any proxy related error (address resolution, no route to host, etc) should result in a ProxyError
@@ -605,14 +606,14 @@ class TestRequests:
requests.get(httpbin(), proxies={"http": "http:///example.com:8080"})
def test_respect_proxy_env_on_send_self_prepared_request(self, httpbin):
- with override_environ(http_proxy=INVALID_PROXY):
+ with override_environ(no_proxy=None, http_proxy=INVALID_PROXY):
with pytest.raises(ProxyError):
session = requests.Session()
request = requests.Request("GET", httpbin())
session.send(request.prepare())
def test_respect_proxy_env_on_send_session_prepared_request(self, httpbin):
- with override_environ(http_proxy=INVALID_PROXY):
+ with override_environ(no_proxy=None, http_proxy=INVALID_PROXY):
with pytest.raises(ProxyError):
session = requests.Session()
request = requests.Request("GET", httpbin())
@@ -620,7 +621,7 @@ class TestRequests:
session.send(prepared)
def test_respect_proxy_env_on_send_with_redirects(self, httpbin):
- with override_environ(http_proxy=INVALID_PROXY):
+ with override_environ(no_proxy=None, http_proxy=INVALID_PROXY):
with pytest.raises(ProxyError):
session = requests.Session()
url = httpbin("redirect/1")
@@ -629,13 +630,13 @@ class TestRequests:
session.send(request.prepare())
def test_respect_proxy_env_on_get(self, httpbin):
- with override_environ(http_proxy=INVALID_PROXY):
+ with override_environ(no_proxy=None, http_proxy=INVALID_PROXY):
with pytest.raises(ProxyError):
session = requests.Session()
session.get(httpbin())
def test_respect_proxy_env_on_request(self, httpbin):
- with override_environ(http_proxy=INVALID_PROXY):
+ with override_environ(no_proxy=None, http_proxy=INVALID_PROXY):
with pytest.raises(ProxyError):
session = requests.Session()
session.request(method="GET", url=httpbin())
diff --git a/tests/utils.py b/tests/utils.py
index 6cb75bf..7871a32 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -7,7 +7,8 @@ def override_environ(**kwargs):
save_env = dict(os.environ)
for key, value in kwargs.items():
if value is None:
- del os.environ[key]
+ with contextlib.suppress(KeyError):
+ del os.environ[key]
else:
os.environ[key] = value
try:
|
