Skip to content

Commit

Permalink
Refactor tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@mccoyp
mccoyp committed Mar 25, 2021
1 parent f41f799 commit 279bd17
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 142 deletions.
44 changes: 12 additions & 32 deletions sdk/keyvault/azure-keyvault-certificates/tests/test_certificates_client.py
View file

Large diffs are not rendered by default.

44 changes: 12 additions & 32 deletions sdk/keyvault/azure-keyvault-certificates/tests/test_certificates_client_async.py
View file

Large diffs are not rendered by default.

35 changes: 8 additions & 27 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 @@ -18,7 +18,7 @@
from parameterized import parameterized, param
import pytest

from _shared.test_case import KeyVaultTestCase
from _test_case import CertificatesTestCase, suffixed_test_name

KeyVaultPreparer = functools.partial(
PowerShellPreparer,
Expand All @@ -30,9 +30,6 @@
def print(*args):
assert all(arg is not None for arg in args)

def suffixed_test_name(testcase_func, param_num, param):
return "{}_{}".format(testcase_func.__name__, parameterized.to_safe_name(param.kwargs.get("api_version")))


def test_create_certificate_client():
vault_url = "vault_url"
Expand All @@ -47,27 +44,11 @@ def test_create_certificate_client():
# [END create_certificate_client]


class TestExamplesKeyVault(KeyVaultTestCase):
def tearDown(self):
HttpChallengeCache.clear()
assert len(HttpChallengeCache._cache) == 0
super(TestExamplesKeyVault, self).tearDown()

def create_client(self, vault_uri, **kwargs):
credential = self.get_credential(CertificateClient)
return self.create_client_from_credential(
CertificateClient, credential=credential, vault_url=vault_uri, **kwargs
)

def _should_skip_test(self, api_version):
if self.is_live:
return api_version != ApiVersion.V7_1 # test only the default version live
return False

class TestExamplesKeyVault(CertificatesTestCase):
@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):
if self._should_skip_test(kwargs.get("api_version")):
if self._skip_if_not_configured(kwargs.get("api_version")):
pytest.skip()
client = self.create_client(azure_keyvault_url, **kwargs)
certificate_client = client
Expand Down Expand Up @@ -151,7 +132,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):
if self._should_skip_test(kwargs.get("api_version")):
if self._skip_if_not_configured(kwargs.get("api_version")):
pytest.skip()
client = self.create_client(azure_keyvault_url, **kwargs)
certificate_client = client
Expand Down Expand Up @@ -217,7 +198,7 @@ def test_example_certificate_list_operations(self, azure_keyvault_url, **kwargs)
)
@KeyVaultPreparer()
def test_example_certificate_backup_restore(self, azure_keyvault_url, **kwargs):
if self._should_skip_test(kwargs.get("api_version")):
if self._skip_if_not_configured(kwargs.get("api_version")):
pytest.skip()
client = self.create_client(azure_keyvault_url, **kwargs)
certificate_client = client
Expand Down Expand Up @@ -264,7 +245,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):
if self._should_skip_test(kwargs.get("api_version")):
if self._skip_if_not_configured(kwargs.get("api_version")):
pytest.skip()
client = self.create_client(azure_keyvault_url, **kwargs)
certificate_client = client
Expand Down Expand Up @@ -311,7 +292,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):
if self._should_skip_test(kwargs.get("api_version")):
if self._skip_if_not_configured(kwargs.get("api_version")):
pytest.skip()
client = self.create_client(azure_keyvault_url, **kwargs)
certificate_client = client
Expand Down Expand Up @@ -354,7 +335,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):
if self._should_skip_test(kwargs.get("api_version")):
if self._skip_if_not_configured(kwargs.get("api_version")):
pytest.skip()
client = self.create_client(azure_keyvault_url, **kwargs)
certificate_client = client
Expand Down
35 changes: 8 additions & 27 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 @@ -12,7 +12,7 @@
from parameterized import parameterized, param
import pytest

from _shared.test_case_async import KeyVaultTestCase
from _test_case_async import CertificatesTestCase, suffixed_test_name

KeyVaultPreparer = functools.partial(
PowerShellPreparer,
Expand All @@ -24,9 +24,6 @@
def print(*args):
assert all(arg is not None for arg in args)

def suffixed_test_name(testcase_func, param_num, param):
return "{}_{}".format(testcase_func.__name__, parameterized.to_safe_name(param.kwargs.get("api_version")))


@pytest.mark.asyncio
async def test_create_certificate():
Expand All @@ -47,27 +44,11 @@ async def test_create_certificate():
# [END create_certificate_client]


class TestExamplesKeyVault(KeyVaultTestCase):
def tearDown(self):
HttpChallengeCache.clear()
assert len(HttpChallengeCache._cache) == 0
super(TestExamplesKeyVault, self).tearDown()

def create_client(self, vault_uri, **kwargs):
credential = self.get_credential(CertificateClient, is_async=True)
return self.create_client_from_credential(
CertificateClient, credential=credential, vault_url=vault_uri, **kwargs
)

def _should_skip_test(self, api_version):
if self.is_live:
return api_version != ApiVersion.V7_1 # test only the default version live
return False

class TestExamplesKeyVault(CertificatesTestCase):
@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):
if self._should_skip_test(kwargs.get("api_version")):
if self._skip_if_not_configured(kwargs.get("api_version")):
pytest.skip()
client = self.create_client(azure_keyvault_url, **kwargs)
certificate_client = client
Expand Down Expand Up @@ -142,7 +123,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):
if self._should_skip_test(kwargs.get("api_version")):
if self._skip_if_not_configured(kwargs.get("api_version")):
pytest.skip()
client = self.create_client(azure_keyvault_url, **kwargs)
certificate_client = client
Expand Down Expand Up @@ -208,7 +189,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):
if self._should_skip_test(kwargs.get("api_version")):
if self._skip_if_not_configured(kwargs.get("api_version")):
pytest.skip()
client = self.create_client(azure_keyvault_url, **kwargs)
certificate_client = client
Expand Down Expand Up @@ -258,7 +239,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):
if self._should_skip_test(kwargs.get("api_version")):
if self._skip_if_not_configured(kwargs.get("api_version")):
pytest.skip()
client = self.create_client(azure_keyvault_url, **kwargs)
certificate_client = client
Expand Down Expand Up @@ -300,7 +281,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):
if self._should_skip_test(kwargs.get("api_version")):
if self._skip_if_not_configured(kwargs.get("api_version")):
pytest.skip()
client = self.create_client(azure_keyvault_url, **kwargs)
certificate_client = client
Expand Down Expand Up @@ -343,7 +324,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):
if self._should_skip_test(kwargs.get("api_version")):
if self._skip_if_not_configured(kwargs.get("api_version")):
pytest.skip()
client = self.create_client(azure_keyvault_url, **kwargs)
certificate_client = client
Expand Down
14 changes: 2 additions & 12 deletions sdk/keyvault/azure-keyvault-certificates/tests/test_merge_certificate.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,15 @@
from parameterized import parameterized, param

from _shared.json_attribute_matcher import json_attribute_matcher
from _shared.test_case import KeyVaultTestCase
from _test_case import CertificatesTestCase, suffixed_test_name


def suffixed_test_name(testcase_func, param_num, param):
return "{}_{}".format(testcase_func.__name__, parameterized.to_safe_name(param.kwargs.get("api_version")))


class MergeCertificateTest(KeyVaultTestCase):
class MergeCertificateTest(CertificatesTestCase):
def __init__(self, *args, **kwargs):
kwargs["match_body"] = False
kwargs["custom_request_matchers"] = [json_attribute_matcher]
super(MergeCertificateTest, self).__init__(*args, **kwargs)

def create_client(self, vault_uri, **kwargs):
credential = self.get_credential(CertificateClient)
return self.create_client_from_credential(
CertificateClient, credential=credential, vault_url=vault_uri, **kwargs
)

@parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name)
@PowerShellPreparer("keyvault", azure_keyvault_url="https://vaultname.vault.azure.net")
def test_merge_certificate(self, azure_keyvault_url, **kwargs):
Expand Down
14 changes: 2 additions & 12 deletions sdk/keyvault/azure-keyvault-certificates/tests/test_merge_certificate_async.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,13 @@
from parameterized import parameterized, param

from _shared.json_attribute_matcher import json_attribute_matcher
from _shared.test_case_async import KeyVaultTestCase
from _test_case_async import CertificatesTestCase, suffixed_test_name


def suffixed_test_name(testcase_func, param_num, param):
return "{}_{}".format(testcase_func.__name__, parameterized.to_safe_name(param.kwargs.get("api_version")))


class MergeCertificateTest(KeyVaultTestCase):
class MergeCertificateTest(CertificatesTestCase):
def __init__(self, *args, **kwargs):
super().__init__(*args, match_body=False, custom_request_matchers=[json_attribute_matcher], **kwargs)

def create_client(self, vault_uri, **kwargs):
credential = self.get_credential(CertificateClient, is_async=True)
return self.create_client_from_credential(
CertificateClient, credential=credential, vault_url=vault_uri, **kwargs
)

@parameterized.expand([param(api_version=api_version) for api_version in ApiVersion], name_func=suffixed_test_name)
@PowerShellPreparer("keyvault", azure_keyvault_url="https://vaultname.vault.azure.net")
async def test_merge_certificate(self, azure_keyvault_url, **kwargs):
Expand Down

0 comments on commit 279bd17

Please sign in to comment.