fix: resolve circular imports (#1942) · googleapis/google-auth-library-python@25c1b06

@@ -813,11 +813,12 @@ def test_no_env_vars_set(self):

813813814814815815

class TestMtlsHelper:

816+

@mock.patch.object(_mtls_helper, "call_client_cert_callback")

816817

@mock.patch("google.auth.transport._mtls_helper._agent_identity_utils")

817818

def test_check_parameters_for_unauthorized_response_with_cached_cert(

818-

self, mock_agent_identity_utils

819+

self, mock_agent_identity_utils, mock_call_client_cert_callback

819820

):

820-

mock_agent_identity_utils.call_client_cert_callback.return_value = (

821+

mock_call_client_cert_callback.return_value = (

821822

CERT_MOCK_VAL,

822823

KEY_MOCK_VAL,

823824

)

@@ -841,16 +842,17 @@ def test_check_parameters_for_unauthorized_response_with_cached_cert(

841842

assert key == KEY_MOCK_VAL

842843

assert cached_fingerprint == "cached_fingerprint"

843844

assert current_fingerprint == "current_fingerprint"

844-

mock_agent_identity_utils.call_client_cert_callback.assert_called_once()

845+

mock_call_client_cert_callback.assert_called_once()

845846

mock_agent_identity_utils.get_cached_cert_fingerprint.assert_called_once_with(

846847

b"cached_cert_bytes"

847848

)

848849849-

@mock.patch("google.auth.transport._mtls_helper._agent_identity_utils")

850+

@mock.patch.object(_mtls_helper, "call_client_cert_callback")

851+

@mock.patch.object(_mtls_helper, "_agent_identity_utils")

850852

def test_check_parameters_for_unauthorized_response_without_cached_cert(

851-

self, mock_agent_identity_utils

853+

self, mock_agent_identity_utils, mock_call_client_cert_callback

852854

):

853-

mock_agent_identity_utils.call_client_cert_callback.return_value = (

855+

mock_call_client_cert_callback.return_value = (

854856

CERT_MOCK_VAL,

855857

KEY_MOCK_VAL,

856858

)

@@ -869,5 +871,22 @@ def test_check_parameters_for_unauthorized_response_without_cached_cert(

869871

assert key == KEY_MOCK_VAL

870872

assert cached_fingerprint == "current_fingerprint"

871873

assert current_fingerprint == "current_fingerprint"

872-

mock_agent_identity_utils.call_client_cert_callback.assert_called_once()

874+

mock_call_client_cert_callback.assert_called_once()

873875

mock_agent_identity_utils.get_cached_cert_fingerprint.assert_not_called()

876+877+

@mock.patch("google.auth.transport._mtls_helper.get_client_ssl_credentials")

878+

def test_call_client_cert_callback(self, mock_get_client_ssl_credentials):

879+

mock_get_client_ssl_credentials.return_value = (

880+

True,

881+

b"cert_bytes",

882+

b"key_bytes",

883+

b"passphrase",

884+

)

885+886+

cert, key = _mtls_helper.call_client_cert_callback()

887+888+

assert cert == b"cert_bytes"

889+

assert key == b"key_bytes"

890+

mock_get_client_ssl_credentials.assert_called_once_with(

891+

generate_encrypted_key=True

892+

)