Skip to content

Commit

Permalink
Single CertificatesTestCase, test refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
mccoyp committed Apr 7, 2021
1 parent 1dbcd8a commit f673dfd
Show file tree
Hide file tree
Showing 16 changed files with 4,145 additions and 7,473 deletions.
14 changes: 9 additions & 5 deletions sdk/keyvault/azure-keyvault-certificates/tests/_test_case.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,30 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# ------------------------------------
from azure.keyvault.certificates import ApiVersion, CertificateClient
from azure.keyvault.certificates import ApiVersion
from azure.keyvault.certificates._shared import HttpChallengeCache
from devtools_testutils import AzureTestCase
from parameterized import parameterized
import pytest

from _shared.test_case import KeyVaultTestCase


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


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

def create_client(self, vault_uri, **kwargs):
credential = self.get_credential(CertificateClient)
if kwargs.pop("is_async", False):
from azure.keyvault.certificates.aio import CertificateClient
credential = self.get_credential(CertificateClient, is_async=True)
else:
from azure.keyvault.certificates import CertificateClient
credential = self.get_credential(CertificateClient)
return self.create_client_from_credential(
CertificateClient, credential=credential, vault_url=vault_uri, **kwargs
)
Expand Down
32 changes: 0 additions & 32 deletions sdk/keyvault/azure-keyvault-certificates/tests/_test_case_async.py

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
interactions:
- request:
body: null
headers:
Accept:
- application/json
Content-Length:
- '0'
User-Agent:
- azsdk-python-keyvault-certificates/4.3.0b1 Python/3.5.3 (Windows-10-10.0.19041-SP0)
method: GET
uri: https://vaultname.vault.azure.net/deletedcertificates?api-version=2016-10-01
response:
body:
string: '{"error":{"code":"Unauthorized","message":"Request is missing a Bearer
or PoP token."}}'
headers:
cache-control: no-cache
content-length: '87'
content-type: application/json; charset=utf-8
date: Tue, 30 Mar 2021 00:25:35 GMT
expires: '-1'
pragma: no-cache
strict-transport-security: max-age=31536000;includeSubDomains
www-authenticate: Bearer authorization="https://login.windows.net/72f988bf-86f1-41af-91ab-2d7cd011db47",
resource="https://vault.azure.net"
x-content-type-options: nosniff
x-ms-keyvault-network-info: conn_type=Ipv4;addr=172.92.159.124;act_addr_fam=InterNetwork;
x-ms-keyvault-region: westus2
x-ms-keyvault-service-version: 1.2.205.0
x-powered-by: ASP.NET
status:
code: 401
message: Unauthorized
url: https://mcpatinokv.vault.azure.net/deletedcertificates?api-version=2016-10-01
- request:
body: null
headers:
Accept:
- application/json
User-Agent:
- azsdk-python-keyvault-certificates/4.3.0b1 Python/3.5.3 (Windows-10-10.0.19041-SP0)
method: GET
uri: https://vaultname.vault.azure.net/deletedcertificates?api-version=2016-10-01
response:
body:
string: '{"value":[{"recoveryId":"https://vaultname.vault.azure.net/deletedcertificates/BackupRestoreCertificate","deletedDate":1617053388,"scheduledPurgeDate":1624829388,"id":"https://vaultname.vault.azure.net/certificates/BackupRestoreCertificate","x5t":"BUYGRo9uO7lTgKog96DrqlW8cxQ","attributes":{"enabled":true,"nbf":1617052679,"exp":1648589279,"created":1617053279,"updated":1617053279,"recoveryLevel":"Recoverable+Purgeable"}},{"recoveryId":"https://vaultname.vault.azure.net/deletedcertificates/livekvtestcert1ab817b7","deletedDate":1617063506,"scheduledPurgeDate":1624839506,"id":"https://vaultname.vault.azure.net/certificates/livekvtestcert1ab817b7","x5t":"L1Jn1bkjLiFa-oyersrblB6FqcQ","attributes":{"enabled":true,"nbf":1617062904,"exp":1648599504,"created":1617063504,"updated":1617063506,"recoveryLevel":"Recoverable+Purgeable"},"tags":{"tag1":"updated_value1"}}],"nextLink":"https://vaultname.vault.azure.net:443/deletedcertificates?api-version=2016-10-01&$skiptoken=eyJOZXh0TWFya2VyIjoiMiExMTYhTURBd01EUXlJV05sY25ScFptbGpZWFJsTDB4SlZrVkxWbFJGVTFSRFJWSlVOamszT1VJeE1VRXdMMUJQVEVsRFdTRXdNREF3TWpnaE9UazVPUzB4TWkwek1WUXlNem8xT1RvMU9TNDVPVGs1T1RrNVdpRS0iLCJUYXJnZXRMb2NhdGlvbiI6MH0"}'
headers:
cache-control: no-cache
content-length: '1190'
content-type: application/json; charset=utf-8
date: Tue, 30 Mar 2021 00:25:35 GMT
expires: '-1'
pragma: no-cache
strict-transport-security: max-age=31536000;includeSubDomains
x-content-type-options: nosniff
x-ms-keyvault-network-info: conn_type=Ipv4;addr=172.92.159.124;act_addr_fam=InterNetwork;
x-ms-keyvault-region: westus2
x-ms-keyvault-service-version: 1.2.205.0
x-powered-by: ASP.NET
status:
code: 200
message: OK
url: https://mcpatinokv.vault.azure.net/deletedcertificates?api-version=2016-10-01
- request:
body: null
headers:
Accept:
- application/json
User-Agent:
- azsdk-python-keyvault-certificates/4.3.0b1 Python/3.5.3 (Windows-10-10.0.19041-SP0)
method: GET
uri: https://vaultname.vault.azure.net:443/deletedcertificates?api-version=2016-10-01&$skiptoken=eyJOZXh0TWFya2VyIjoiMiExMTYhTURBd01EUXlJV05sY25ScFptbGpZWFJsTDB4SlZrVkxWbFJGVTFSRFJWSlVOamszT1VJeE1VRXdMMUJQVEVsRFdTRXdNREF3TWpnaE9UazVPUzB4TWkwek1WUXlNem8xT1RvMU9TNDVPVGs1T1RrNVdpRS0iLCJUYXJnZXRMb2NhdGlvbiI6MH0
response:
body:
string: '{"value":[{"recoveryId":"https://vaultname.vault.azure.net/deletedcertificates/livekvtestcert79f71634","deletedDate":1617063529,"scheduledPurgeDate":1624839529,"id":"https://vaultname.vault.azure.net/certificates/livekvtestcert79f71634","x5t":"FH1Zh9HNVv0Gm1jc6-5qhg1OY6k","attributes":{"enabled":true,"nbf":1617062927,"exp":1648599527,"created":1617063527,"updated":1617063529,"recoveryLevel":"Recoverable+Purgeable"},"tags":{"tag1":"updated_value1"}},{"recoveryId":"https://vaultname.vault.azure.net/deletedcertificates/livekvtestcert79f81635","deletedDate":1617063558,"scheduledPurgeDate":1624839558,"id":"https://vaultname.vault.azure.net/certificates/livekvtestcert79f81635","x5t":"4IPSDzzSukznn0oL4OtNZmk_IBw","attributes":{"enabled":true,"nbf":1617062951,"exp":1648599551,"created":1617063551,"updated":1617063557,"recoveryLevel":"Recoverable+Purgeable"},"tags":{"tag1":"updated_value1"}}],"nextLink":null}'
headers:
cache-control: no-cache
content-length: '917'
content-type: application/json; charset=utf-8
date: Tue, 30 Mar 2021 00:25:35 GMT
expires: '-1'
pragma: no-cache
strict-transport-security: max-age=31536000;includeSubDomains
x-content-type-options: nosniff
x-ms-keyvault-network-info: conn_type=Ipv4;addr=172.92.159.124;act_addr_fam=InterNetwork;
x-ms-keyvault-region: westus2
x-ms-keyvault-service-version: 1.2.205.0
x-powered-by: ASP.NET
status:
code: 200
message: OK
url: https://mcpatinokv.vault.azure.net:443/deletedcertificates?api-version=2016-10-01&$skiptoken=eyJOZXh0TWFya2VyIjoiMiExMTYhTURBd01EUXlJV05sY25ScFptbGpZWFJsTDB4SlZrVkxWbFJGVTFSRFJWSlVOamszT1VJeE1VRXdMMUJQVEVsRFdTRXdNREF3TWpnaE9UazVPUzB4TWkwek1WUXlNem8xT1RvMU9TNDVPVGs1T1RrNVdpRS0iLCJUYXJnZXRMb2NhdGlvbiI6MH0
version: 1
Loading

0 comments on commit f673dfd

Please sign in to comment.