Skip to content

Commit 64b4ada

Browse files
committed
Added testing for async
1 parent 2ea3f6b commit 64b4ada

File tree

3 files changed

+23
-15
lines changed

3 files changed

+23
-15
lines changed

tests/entraid_utils.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
ManagedIdentityType,
1919
ServicePrincipalIdentityProviderConfig,
2020
_create_provider_from_managed_identity,
21-
_create_provider_from_service_principal, DefaultAzureCredentialIdentityProviderConfig,
21+
_create_provider_from_service_principal,
22+
DefaultAzureCredentialIdentityProviderConfig,
2223
_create_provider_from_default_azure_credential,
2324
)
2425
from tests.conftest import mock_identity_provider
@@ -51,10 +52,12 @@ def identity_provider(request) -> IdentityProviderInterface:
5152
return _create_provider_from_service_principal(config)
5253

5354

54-
def get_identity_provider_config(request) -> Union[
55+
def get_identity_provider_config(
56+
request,
57+
) -> Union[
5558
ManagedIdentityProviderConfig,
5659
ServicePrincipalIdentityProviderConfig,
57-
DefaultAzureCredentialIdentityProviderConfig
60+
DefaultAzureCredentialIdentityProviderConfig,
5861
]:
5962
if hasattr(request, "param"):
6063
kwargs = request.param.get("idp_kwargs", {})
@@ -123,7 +126,10 @@ def _get_service_principal_provider_config(
123126
app_kwargs=kwargs,
124127
)
125128

126-
def _get_default_azure_credential_provider_config(request) -> DefaultAzureCredentialIdentityProviderConfig:
129+
130+
def _get_default_azure_credential_provider_config(
131+
request,
132+
) -> DefaultAzureCredentialIdentityProviderConfig:
127133
scopes = os.getenv("AZURE_REDIS_SCOPES", ())
128134

129135
if hasattr(request, "param"):
@@ -134,12 +140,10 @@ def _get_default_azure_credential_provider_config(request) -> DefaultAzureCreden
134140
token_kwargs = {}
135141

136142
if isinstance(scopes, str):
137-
scopes = scopes.split(',')
143+
scopes = scopes.split(",")
138144

139145
return DefaultAzureCredentialIdentityProviderConfig(
140-
scopes=scopes,
141-
app_kwargs=kwargs,
142-
token_kwargs=token_kwargs
146+
scopes=scopes, app_kwargs=kwargs, token_kwargs=token_kwargs
143147
)
144148

145149

tests/test_asyncio/conftest.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@
1818
from .compat import mock
1919

2020

21-
class AuthType(Enum):
22-
MANAGED_IDENTITY = "managed_identity"
23-
SERVICE_PRINCIPAL = "service_principal"
24-
25-
2621
async def _get_info(redis_url):
2722
client = redis.Redis.from_url(redis_url)
2823
info = await client.info()

tests/test_asyncio/test_credentials.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from redis.exceptions import ConnectionError
1919
from redis.utils import str_if_bytes
2020
from tests.conftest import get_endpoint, skip_if_redis_enterprise
21+
from tests.entraid_utils import AuthType
2122
from tests.test_asyncio.conftest import get_credential_provider
2223

2324
try:
@@ -616,8 +617,12 @@ class TestEntraIdCredentialsProvider:
616617
"cred_provider_class": EntraIdCredentialsProvider,
617618
"cred_provider_kwargs": {"block_for_initial": True},
618619
},
620+
{
621+
"cred_provider_class": EntraIdCredentialsProvider,
622+
"idp_kwargs": {"auth_type": AuthType.DEFAULT_AZURE_CREDENTIAL},
623+
},
619624
],
620-
ids=["blocked", "non-blocked"],
625+
ids=["blocked", "non-blocked", "DefaultAzureCredential"],
621626
indirect=True,
622627
)
623628
@pytest.mark.asyncio
@@ -692,8 +697,12 @@ class TestClusterEntraIdCredentialsProvider:
692697
"cred_provider_class": EntraIdCredentialsProvider,
693698
"cred_provider_kwargs": {"block_for_initial": True},
694699
},
700+
{
701+
"cred_provider_class": EntraIdCredentialsProvider,
702+
"idp_kwargs": {"auth_type": AuthType.DEFAULT_AZURE_CREDENTIAL},
703+
},
695704
],
696-
ids=["blocked", "non-blocked"],
705+
ids=["blocked", "non-blocked", "DefaultAzureCredential"],
697706
indirect=True,
698707
)
699708
@pytest.mark.asyncio

0 commit comments

Comments
 (0)