fixed tests

Author: daniel-sanche

tests/test_agent_identity_utils.py

@@ -282,23 +282,6 @@ def test_get_agent_identity_certificate_path_fallback_to_well_known_path(
         mock_sleep.assert_called_once()
         assert mock_is_ready.call_count == 2
 
-    @mock.patch("google.auth.transport._mtls_helper.get_client_ssl_credentials")
-    def test_call_client_cert_callback(self, mock_get_client_ssl_credentials):
-        mock_get_client_ssl_credentials.return_value = (
-            True,
-            b"cert_bytes",
-            b"key_bytes",
-            b"passphrase",
-        )
-
-        cert, key = _agent_identity_utils.call_client_cert_callback()
-
-        assert cert == b"cert_bytes"
-        assert key == b"key_bytes"
-        mock_get_client_ssl_credentials.assert_called_once_with(
-            generate_encrypted_key=True
-        )
-
     def test_get_cached_cert_fingerprint_no_cert(self):
         with pytest.raises(ValueError, match="mTLS connection is not configured."):
             _agent_identity_utils.get_cached_cert_fingerprint(None)

tests/transport/test__mtls_helper.py

@@ -813,11 +813,12 @@ def test_no_env_vars_set(self):
 
 
 class TestMtlsHelper:
+    @mock.patch.object(_mtls_helper, "call_client_cert_callback")
     @mock.patch("google.auth.transport._mtls_helper._agent_identity_utils")
     def test_check_parameters_for_unauthorized_response_with_cached_cert(
-        self, mock_agent_identity_utils
+        self, mock_agent_identity_utils, mock_call_client_cert_callback
     ):
-        mock_agent_identity_utils.call_client_cert_callback.return_value = (
+        mock_call_client_cert_callback.return_value = (
             CERT_MOCK_VAL,
             KEY_MOCK_VAL,
         )
@@ -841,16 +842,17 @@ def test_check_parameters_for_unauthorized_response_with_cached_cert(
         assert key == KEY_MOCK_VAL
         assert cached_fingerprint == "cached_fingerprint"
         assert current_fingerprint == "current_fingerprint"
-        mock_agent_identity_utils.call_client_cert_callback.assert_called_once()
+        mock_call_client_cert_callback.assert_called_once()
         mock_agent_identity_utils.get_cached_cert_fingerprint.assert_called_once_with(
             b"cached_cert_bytes"
         )
 
-    @mock.patch("google.auth.transport._mtls_helper._agent_identity_utils")
+    @mock.patch.object(_mtls_helper, "call_client_cert_callback")
+    @mock.patch.object(_mtls_helper, "_agent_identity_utils")
     def test_check_parameters_for_unauthorized_response_without_cached_cert(
-        self, mock_agent_identity_utils
+        self, mock_agent_identity_utils, mock_call_client_cert_callback
     ):
-        mock_agent_identity_utils.call_client_cert_callback.return_value = (
+        mock_call_client_cert_callback.return_value = (
             CERT_MOCK_VAL,
             KEY_MOCK_VAL,
         )
@@ -869,5 +871,22 @@ def test_check_parameters_for_unauthorized_response_without_cached_cert(
         assert key == KEY_MOCK_VAL
         assert cached_fingerprint == "current_fingerprint"
         assert current_fingerprint == "current_fingerprint"
-        mock_agent_identity_utils.call_client_cert_callback.assert_called_once()
+        mock_call_client_cert_callback.assert_called_once()
         mock_agent_identity_utils.get_cached_cert_fingerprint.assert_not_called()
+
+    @mock.patch("google.auth.transport._mtls_helper.get_client_ssl_credentials")
+    def test_call_client_cert_callback(self, mock_get_client_ssl_credentials):
+        mock_get_client_ssl_credentials.return_value = (
+            True,
+            b"cert_bytes",
+            b"key_bytes",
+            b"passphrase",
+        )
+
+        cert, key = _mtls_helper.call_client_cert_callback()
+
+        assert cert == b"cert_bytes"
+        assert key == b"key_bytes"
+        mock_get_client_ssl_credentials.assert_called_once_with(
+            generate_encrypted_key=True
+        )

tests/transport/test_requests.py

@@ -566,7 +566,7 @@ def test_cert_rotation_when_cert_mismatch_and_mtls_enabled(self):
 
         # Mock call_client_cert_callback to return the new certificate.
         with mock.patch.object(
-            google.auth.transport._mtls_helper._agent_identity_utils,
+            google.auth.transport._mtls_helper,
             "call_client_cert_callback",
             return_value=(new_cert, new_key),
         ) as mock_callback:
@@ -605,7 +605,7 @@ def test_no_cert_rotation_when_cert_match_and_mTLS_enabled(self):
 
         # Mock call_client_cert_callback to return the new certificate.
         with mock.patch.object(
-            google.auth.transport._mtls_helper._agent_identity_utils,
+            google.auth.transport._mtls_helper,
             "call_client_cert_callback",
             return_value=(new_cert, new_key),
         ):
@@ -638,7 +638,7 @@ def test_no_cert_match_check_when_mtls_disabled(self):
 
         # Mock call_client_cert_callback to return the new certificate.
         with mock.patch.object(
-            google.auth.transport._mtls_helper._agent_identity_utils,
+            google.auth.transport._mtls_helper,
             "call_client_cert_callback",
             return_value=(new_cert, new_key),
         ) as mock_callback:

tests/transport/test_urllib3.py

@@ -343,7 +343,7 @@ def test_cert_rotation_when_cert_mismatch_and_mtls_endpoint_used(self):
         authed_http._is_mtls = True
         # Mock call_client_cert_callback to return the new certificate.
         with mock.patch.object(
-            google.auth._agent_identity_utils,
+            google.auth.transport._mtls_helper,
             "call_client_cert_callback",
             return_value=(new_cert, new_key),
         ) as mock_callback:
@@ -378,7 +378,7 @@ def test_no_cert_rotation_when_cert_match_and_mtls_endpoint_used(self):
         authed_http._is_mtls = True
         # Mock call_client_cert_callback to return the certificate.
         with mock.patch.object(
-            google.auth._agent_identity_utils,
+            google.auth.transport._mtls_helper,
             "call_client_cert_callback",
             return_value=(new_cert, new_key),
         ):
@@ -408,7 +408,7 @@ def test_no_cert_match_check_when_mtls_endpoint_not_used(self):
 
         # Mock call_client_cert_callback to return the certificate.
         with mock.patch.object(
-            google.auth._agent_identity_utils,
+            google.auth.transport._mtls_helper,
             "call_client_cert_callback",
             return_value=(new_cert, new_key),
         ) as mock_callback: