fix: Use monkeypatch where possible

untitaker · untitaker · commit 80067ede8d09 · 2019-04-25T14:45:36.000+02:00
diff --git a/tests/test_client.py b/tests/test_client.py
@@ -92,66 +92,66 @@ def test_proxy_none_noenv(monkeypatch):
 
 
 def test_proxy_none_httpenv_select(monkeypatch):
-    os.environ["HTTP_PROXY"] = "http://localhost/123"
+    monkeypatch.setenv("HTTP_PROXY", "http://localhost/123")
     client = Client("http://foo@sentry.io/123")
     assert client.transport._pool.proxy.scheme == "http"
 
 
 def test_proxy_none_httpsenv_select(monkeypatch):
-    os.environ["HTTPS_PROXY"] = "https://localhost/123"
+    monkeypatch.setenv("HTTPS_PROXY", "https://localhost/123")
     client = Client("https://foo@sentry.io/123")
     assert client.transport._pool.proxy.scheme == "https"
 
 
 def test_proxy_none_httpenv_fallback(monkeypatch):
-    os.environ["HTTP_PROXY"] = "http://localhost/123"
+    monkeypatch.setenv("HTTP_PROXY", "http://localhost/123")
     client = Client("https://foo@sentry.io/123")
     assert client.transport._pool.proxy.scheme == "http"
 
 
 def test_proxy_bothselect_bothen(monkeypatch):
-    os.environ["HTTP_PROXY"] = "http://localhost/123"
-    os.environ["HTTPS_PROXY"] = "https://localhost/123"
+    monkeypatch.setenv("HTTP_PROXY", "http://localhost/123")
+    monkeypatch.setenv("HTTPS_PROXY", "https://localhost/123")
     client = Client("https://foo@sentry.io/123", http_proxy="", https_proxy="")
     assert client.transport._pool.proxy is None
 
 
 def test_proxy_bothavoid_bothenv(monkeypatch):
-    os.environ["HTTP_PROXY"] = "http://localhost/123"
-    os.environ["HTTPS_PROXY"] = "https://localhost/123"
+    monkeypatch.setenv("HTTP_PROXY", "http://localhost/123")
+    monkeypatch.setenv("HTTPS_PROXY", "https://localhost/123")
     client = Client("https://foo@sentry.io/123", http_proxy=None, https_proxy=None)
     assert client.transport._pool.proxy.scheme == "https"
 
 
 def test_proxy_bothselect_httpenv(monkeypatch):
-    os.environ["HTTP_PROXY"] = "http://localhost/123"
+    monkeypatch.setenv("HTTP_PROXY", "http://localhost/123")
     client = Client("https://foo@sentry.io/123", http_proxy=None, https_proxy=None)
     assert client.transport._pool.proxy.scheme == "http"
 
 
 def test_proxy_httpselect_bothenv(monkeypatch):
-    os.environ["HTTP_PROXY"] = "http://localhost/123"
-    os.environ["HTTPS_PROXY"] = "https://localhost/123"
+    monkeypatch.setenv("HTTP_PROXY", "http://localhost/123")
+    monkeypatch.setenv("HTTPS_PROXY", "https://localhost/123")
     client = Client("https://foo@sentry.io/123", http_proxy=None, https_proxy="")
     assert client.transport._pool.proxy.scheme == "http"
 
 
 def test_proxy_httpsselect_bothenv(monkeypatch):
-    os.environ["HTTP_PROXY"] = "http://localhost/123"
-    os.environ["HTTPS_PROXY"] = "https://localhost/123"
+    monkeypatch.setenv("HTTP_PROXY", "http://localhost/123")
+    monkeypatch.setenv("HTTPS_PROXY", "https://localhost/123")
     client = Client("https://foo@sentry.io/123", http_proxy="", https_proxy=None)
     assert client.transport._pool.proxy.scheme == "https"
 
 
 def test_proxy_httpselect_httpsenv(monkeypatch):
-    os.environ["HTTPS_PROXY"] = "https://localhost/123"
+    monkeypatch.setenv("HTTPS_PROXY", "https://localhost/123")
     client = Client("https://foo@sentry.io/123", http_proxy=None, https_proxy="")
     assert client.transport._pool.proxy is None
 
 
 def test_proxy_httpsselect_bothenv_http(monkeypatch):
-    os.environ["HTTP_PROXY"] = "http://localhost/123"
-    os.environ["HTTPS_PROXY"] = "https://localhost/123"
+    monkeypatch.setenv("HTTP_PROXY", "http://localhost/123")
+    monkeypatch.setenv("HTTPS_PROXY", "https://localhost/123")
     client = Client("http://foo@sentry.io/123", http_proxy=None, https_proxy=None)
     assert client.transport._pool.proxy.scheme == "http"
 
