diff --git a/sdk/keyvault/azure-keyvault-certificates/tests/_test_case.py b/sdk/keyvault/azure-keyvault-certificates/tests/_test_case.py index 22ffdddb805b..04eddc8bdb6e 100644 --- a/sdk/keyvault/azure-keyvault-certificates/tests/_test_case.py +++ b/sdk/keyvault/azure-keyvault-certificates/tests/_test_case.py @@ -2,8 +2,8 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # ------------------------------------ -from azure.keyvault.certificates import ApiVersion from azure.keyvault.certificates._shared import HttpChallengeCache +from azure.keyvault.certificates._shared.client_base import DEFAULT_VERSION from devtools_testutils import AzureTestCase from parameterized import parameterized import pytest @@ -30,6 +30,6 @@ def create_client(self, vault_uri, **kwargs): CertificateClient, credential=credential, vault_url=vault_uri, **kwargs ) - def _skip_if_not_configured(self, api_version): - if self.is_live and api_version != ApiVersion.V7_1: + def _skip_if_not_configured(self, api_version, **kwargs): + if self.is_live and api_version != DEFAULT_VERSION: pytest.skip("This test only uses the default API version for live tests") diff --git a/sdk/keyvault/azure-keyvault-certificates/tests/test_certificates_client.py b/sdk/keyvault/azure-keyvault-certificates/tests/test_certificates_client.py index e96dc9619705..a79496d8378d 100644 --- a/sdk/keyvault/azure-keyvault-certificates/tests/test_certificates_client.py +++ b/sdk/keyvault/azure-keyvault-certificates/tests/test_certificates_client.py @@ -240,7 +240,7 @@ def test_import_certificate_not_password_encoded_no_policy(self, azure_keyvault_ @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() def test_import_certificate_password_encoded_no_policy(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, **kwargs) # If a certificate is password encoded, we have to pass in 'password' @@ -285,7 +285,7 @@ def test_list(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() def test_list_certificate_versions(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, **kwargs) cert_name = self.get_resource_name("certver") @@ -318,7 +318,7 @@ def test_list_certificate_versions(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() def test_crud_contacts(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, **kwargs) contact_list = [ @@ -393,7 +393,7 @@ def test_recover_and_purge(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() def test_async_request_cancellation_and_deletion(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, **kwargs) cert_name = self.get_resource_name("asyncCanceledDeletedCert") @@ -450,7 +450,7 @@ def test_async_request_cancellation_and_deletion(self, azure_keyvault_url, **kwa ) @KeyVaultPreparer() def test_policy(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, **kwargs) cert_name = self.get_resource_name("policyCertificate") @@ -488,7 +488,7 @@ def test_policy(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() def test_get_pending_certificate_signing_request(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, **kwargs) cert_name = self.get_resource_name("unknownIssuerCert") @@ -532,7 +532,7 @@ def test_backup_restore(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() def test_crud_issuer(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, **kwargs) issuer_name = self.get_resource_name("issuer") @@ -614,7 +614,7 @@ def test_crud_issuer(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() def test_logging_enabled(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, logging_enable=True, **kwargs) mock_handler = MockHandler() @@ -641,7 +641,7 @@ def test_logging_enabled(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() def test_logging_disabled(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, logging_enable=False, **kwargs) mock_handler = MockHandler() @@ -678,7 +678,7 @@ def test_2016_10_01_models(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() def test_get_certificate_version(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, **kwargs) cert_name = self.get_resource_name("cert") diff --git a/sdk/keyvault/azure-keyvault-certificates/tests/test_certificates_client_async.py b/sdk/keyvault/azure-keyvault-certificates/tests/test_certificates_client_async.py index 772d4d5f7658..1d28fa9928e7 100644 --- a/sdk/keyvault/azure-keyvault-certificates/tests/test_certificates_client_async.py +++ b/sdk/keyvault/azure-keyvault-certificates/tests/test_certificates_client_async.py @@ -236,7 +236,7 @@ async def test_import_certificate_not_password_encoded_no_policy(self, azure_key @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() async def test_import_certificate_password_encoded_no_policy(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, is_async=True, **kwargs) # If a certificate is password encoded, we have to pass in 'password' @@ -281,7 +281,7 @@ async def test_list(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() async def test_list_certificate_versions(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, is_async=True, **kwargs) cert_name = self.get_resource_name("certver") @@ -316,7 +316,7 @@ async def test_list_certificate_versions(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() async def test_crud_contacts(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, is_async=True, **kwargs) contact_list = [ @@ -400,7 +400,7 @@ async def test_recover_and_purge(self, azure_keyvault_url, **kwargs): @pytest.mark.skip("Skipping because service doesn't allow cancellation of certificates with issuer 'Unknown'") @KeyVaultPreparer() async def test_async_request_cancellation_and_deletion(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, is_async=True, **kwargs) cert_name = self.get_resource_name("asyncCanceledDeletedCert") @@ -464,7 +464,7 @@ async def test_async_request_cancellation_and_deletion(self, azure_keyvault_url, ) @KeyVaultPreparer() async def test_policy(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, is_async=True, **kwargs) cert_name = self.get_resource_name("policyCertificate") @@ -502,7 +502,7 @@ async def test_policy(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() async def test_get_pending_certificate_signing_request(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, is_async=True, **kwargs) cert_name = self.get_resource_name("unknownIssuerCert") @@ -547,7 +547,7 @@ async def test_backup_restore(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() async def test_crud_issuer(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, is_async=True, **kwargs) issuer_name = self.get_resource_name("issuer") @@ -629,7 +629,7 @@ async def test_crud_issuer(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() async def test_logging_enabled(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, is_async=True, logging_enable=True, **kwargs) mock_handler = MockHandler() @@ -656,7 +656,7 @@ async def test_logging_enabled(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() async def test_logging_disabled(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, is_async=True, logging_enable=False, **kwargs) mock_handler = MockHandler() @@ -680,7 +680,7 @@ async def test_logging_disabled(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() async def test_get_certificate_version(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, is_async=True, **kwargs) cert_name = self.get_resource_name("cert") diff --git a/sdk/keyvault/azure-keyvault-certificates/tests/test_examples_certificates.py b/sdk/keyvault/azure-keyvault-certificates/tests/test_examples_certificates.py index c0029e9a690c..b53ce43d67e5 100644 --- a/sdk/keyvault/azure-keyvault-certificates/tests/test_examples_certificates.py +++ b/sdk/keyvault/azure-keyvault-certificates/tests/test_examples_certificates.py @@ -47,7 +47,7 @@ class TestExamplesKeyVault(CertificatesTestCase, KeyVaultTestCase): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() def test_example_certificate_crud_operations(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, **kwargs) certificate_client = client cert_name = self.get_resource_name("cert-name") @@ -130,7 +130,7 @@ def test_example_certificate_crud_operations(self, azure_keyvault_url, **kwargs) @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() def test_example_certificate_list_operations(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, **kwargs) certificate_client = client @@ -195,7 +195,7 @@ def test_example_certificate_list_operations(self, azure_keyvault_url, **kwargs) ) @KeyVaultPreparer() def test_example_certificate_backup_restore(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, **kwargs) certificate_client = client @@ -241,7 +241,7 @@ def test_example_certificate_backup_restore(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() def test_example_certificate_recover(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, **kwargs) certificate_client = client @@ -287,7 +287,7 @@ def test_example_certificate_recover(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() def test_example_contacts(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, **kwargs) certificate_client = client @@ -329,7 +329,7 @@ def test_example_contacts(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() def test_example_issuers(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, **kwargs) certificate_client = client diff --git a/sdk/keyvault/azure-keyvault-certificates/tests/test_examples_certificates_async.py b/sdk/keyvault/azure-keyvault-certificates/tests/test_examples_certificates_async.py index f269495d7861..7a195d34829e 100644 --- a/sdk/keyvault/azure-keyvault-certificates/tests/test_examples_certificates_async.py +++ b/sdk/keyvault/azure-keyvault-certificates/tests/test_examples_certificates_async.py @@ -47,7 +47,7 @@ class TestExamplesKeyVault(CertificatesTestCase, KeyVaultTestCase): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() async def test_example_certificate_crud_operations(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, is_async=True, **kwargs) certificate_client = client cert_name = self.get_resource_name("cert-name") @@ -121,7 +121,7 @@ async def test_example_certificate_crud_operations(self, azure_keyvault_url, **k @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() async def test_example_certificate_list_operations(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, is_async=True, **kwargs) certificate_client = client @@ -186,7 +186,7 @@ async def test_example_certificate_list_operations(self, azure_keyvault_url, **k ) @KeyVaultPreparer() async def test_example_certificate_backup_restore(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, is_async=True, **kwargs) certificate_client = client @@ -235,7 +235,7 @@ async def test_example_certificate_backup_restore(self, azure_keyvault_url, **kw @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() async def test_example_certificate_recover(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, is_async=True, **kwargs) certificate_client = client @@ -276,7 +276,7 @@ async def test_example_certificate_recover(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() async def test_example_contacts(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, is_async=True, **kwargs) certificate_client = client @@ -318,7 +318,7 @@ async def test_example_contacts(self, azure_keyvault_url, **kwargs): @parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name) @KeyVaultPreparer() async def test_example_issuers(self, azure_keyvault_url, **kwargs): - self._skip_if_not_configured(kwargs.get("api_version")) + self._skip_if_not_configured(**kwargs) client = self.create_client(azure_keyvault_url, is_async=True, **kwargs) certificate_client = client