Refactor test for proxy conflict in get_client method

Signed-off-by: Shahaf Bahar <[email protected]>

Author: sbahar619

tests/test_resources.py

@@ -1,7 +1,6 @@
 import pytest
 import yaml
 import kubernetes
-import os
 from testcontainers.k3s import K3SContainer
 
 from ocp_resources.exceptions import ResourceTeardownError
@@ -106,14 +105,16 @@ def test_resource_context_manager_exit(self, client):
             with TestSecretExit(name="test-context-manager-exit", namespace="default", client=client):
                 pass
 
-    def test_proxy_conflict_raises_value_error(self):
-        os.environ["OPENSHIFT_PYTHON_WRAPPER_CLIENT_USE_PROXY"] = "1"
-        os.environ["HTTPS_PROXY"] = "http://env-proxy.com"
+    def test_proxy_conflict_raises_value_error(self, monkeypatch):
+        monkeypatch.setenv(name="OPENSHIFT_PYTHON_WRAPPER_CLIENT_USE_PROXY", value="1")
+        monkeypatch.setenv(name="HTTPS_PROXY", value="http://env-proxy.com")
+
         client_configuration = kubernetes.client.Configuration()
         client_configuration.proxy = "http://not-env-proxy.com"
-        with pytest.raises(
-            ValueError,
-            match="Conflicting proxy settings: client_configuration.proxy=http://not-env-proxy.com, "
-            "but the environment variable 'OPENSHIFT_PYTHON_WRAPPER_CLIENT_USE_PROXY' defines proxy as http://env-proxy.com.",
-        ):
+
+        with pytest.raises(ValueError) as exc_info:
             get_client(client_configuration=client_configuration)
+
+        assert "Conflicting proxy settings" in str(exc_info.value)
+        assert "http://not-env-proxy.com" in str(exc_info.value)
+        assert "http://env-proxy.com" in str(exc_info.value)