Migrate client ca tests

Author: surister

tests/client/test_http.py

@@ -51,12 +51,12 @@
     _get_socket_opts,
     _remove_certs_for_non_https,
 )
+from tests.client.utils import temp_env
 from tests.conftest import REQUEST_PATH, fake_response
 
-CA_CERT_PATH = certifi.where()
-
 mocked_request = MagicMock(spec=urllib3.response.HTTPResponse)
 
+
 def fake_request(response=None):
     def request(*args, **kwargs):
         if isinstance(response, list):
@@ -373,14 +373,26 @@ def test_params():
 
 
 def test_client_ca():
-    os.environ["REQUESTS_CA_BUNDLE"] = CA_CERT_PATH
-    try:
-        Client("http://127.0.0.1:4200")
-    except ProgrammingError:
-        pytest.fail("HTTP not working with REQUESTS_CA_BUNDLE")
-    finally:
-        os.unsetenv("REQUESTS_CA_BUNDLE")
-        os.environ["REQUESTS_CA_BUNDLE"] = ""
+    """
+    Verify that if env variable `REQUESTS_CA_BUNDLE` is set, certs are loaded into the pool.
+    """
+    with temp_env(REQUESTS_CA_BUNDLE=certifi.where()):
+        client = Client("http://127.0.0.1:4200")
+        assert 'ca_certs' in client._pool_kw
+
+
+def test_remove_certs_for_non_https():
+    """
+    Verify that `_remove_certs_for_non_https` correctly removes ca_certs.
+    """
+    d = _remove_certs_for_non_https("https", {"ca_certs": 1})
+    assert "ca_certs" in d
+
+    kwargs = {"ca_certs": 1, "foobar": 2, "cert_file": 3}
+    d = _remove_certs_for_non_https("http", kwargs)
+    assert 'ca_certs' not in d
+    assert 'cert_file' not in d
+    assert 'foobar' in d
 
 
 class ClientAddressRequestHandler(BaseHTTPRequestHandler):
@@ -444,28 +456,6 @@ def test_client_keepalive(self):
             self.assertEqual(result, another_result)
 
 
-class RequestsCaBundleTest(TestCase):
-    def test_open_client(self):
-        os.environ["REQUESTS_CA_BUNDLE"] = CA_CERT_PATH
-        try:
-            Client("http://127.0.0.1:4200")
-        except ProgrammingError:
-            self.fail("HTTP not working with REQUESTS_CA_BUNDLE")
-        finally:
-            os.unsetenv("REQUESTS_CA_BUNDLE")
-            os.environ["REQUESTS_CA_BUNDLE"] = ""
-
-    def test_remove_certs_for_non_https(self):
-        d = _remove_certs_for_non_https("https", {"ca_certs": 1})
-        self.assertIn("ca_certs", d)
-
-        kwargs = {"ca_certs": 1, "foobar": 2, "cert_file": 3}
-        d = _remove_certs_for_non_https("http", kwargs)
-        self.assertNotIn("ca_certs", d)
-        self.assertNotIn("cert_file", d)
-        self.assertIn("foobar", d)
-
-
 class TimeoutRequestHandler(BaseHTTPRequestHandler):
     """
     HTTP handler for use with TestingHTTPServer

tests/client/test_serialization.py

@@ -76,7 +76,7 @@ def test_naive_datetime_serialization():
 
 def test_aware_datetime_serialization():
     """
-     Verify that a `datetime` that is tz aware type can be serialized.
+    Verify that a `datetime` that is tz aware type can be serialized.
     """
     data = dt.datetime.fromisoformat("2023-06-26T09:24:00.123+02:00")
     result = json_dumps(data)
@@ -106,13 +106,11 @@ def test_date_serialization():
     assert result == b'1461196800000'
 
 
-
 def test_uuid_serialization():
     """
     Verify that a `uuid.UUID` can be serialized. We do not care about specific uuid versions,
-    just the object that is re-used across all versions by the uuid module.
+    just the object that is re-used across all versions of the uuid module.
     """
     data = uuid.UUID(bytes=(50583033507982468033520929066863110751).to_bytes(16), version=4)
     result = json_dumps(data)
     assert result == b'"260df019-a183-431f-ad46-115ccdf12a5f"'
-