Skip to content

Commit

Permalink
Thanks, Charles!
Browse files Browse the repository at this point in the history
  • Loading branch information
@mccoyp
mccoyp committed Apr 7, 2021
1 parent f673dfd commit 2bb1b35
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 35 deletions.
6 changes: 3 additions & 3 deletions sdk/keyvault/azure-keyvault-certificates/tests/_test_case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")
20 changes: 10 additions & 10 deletions sdk/keyvault/azure-keyvault-certificates/tests/test_certificates_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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 = [
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand Down Expand Up @@ -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")
Expand Down
20 changes: 10 additions & 10 deletions sdk/keyvault/azure-keyvault-certificates/tests/test_certificates_client_async.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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 = [
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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")
Expand Down
12 changes: 6 additions & 6 deletions sdk/keyvault/azure-keyvault-certificates/tests/test_examples_certificates.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
12 changes: 6 additions & 6 deletions sdk/keyvault/azure-keyvault-certificates/tests/test_examples_certificates_async.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 2bb1b35

Please sign in to comment.