From 3fe90d82297adab0f19ce432c2c954948f5971e9 Mon Sep 17 00:00:00 2001 From: Charles Lowell Date: Tue, 9 Jun 2020 14:28:10 -0700 Subject: [PATCH] remove redundant await_prepared_test --- .../tests/_shared/test_case_async.py | 19 -------- .../tests/test_certificates_client_async.py | 12 ----- .../tests/test_examples_certificates_async.py | 6 --- .../tests/test_merge_certificate_async.py | 1 - .../tests/_shared/test_case_async.py | 19 -------- .../tests/test_crypto_client_async.py | 45 +++++++++---------- .../tests/test_examples_crypto_async.py | 3 -- .../tests/test_keys_async.py | 9 ---- .../tests/test_samples_keys_async.py | 4 -- .../tests/_shared/test_case_async.py | 19 -------- .../tests/test_samples_secrets_async.py | 4 -- .../tests/test_secrets_async.py | 9 ---- 12 files changed, 20 insertions(+), 130 deletions(-) diff --git a/sdk/keyvault/azure-keyvault-certificates/tests/_shared/test_case_async.py b/sdk/keyvault/azure-keyvault-certificates/tests/_shared/test_case_async.py index 4462e8aa8667..07991be314ff 100644 --- a/sdk/keyvault/azure-keyvault-certificates/tests/_shared/test_case_async.py +++ b/sdk/keyvault/azure-keyvault-certificates/tests/_shared/test_case_async.py @@ -3,11 +3,9 @@ # Licensed under the MIT License. # ------------------------------------ import asyncio -import functools from azure_devtools.scenario_tests.patches import mock_in_unit_test from devtools_testutils import AzureMgmtTestCase -from .helpers_async import get_completed_future def skip_sleep(unit_test): @@ -26,23 +24,6 @@ def setUp(self): self.list_test_size = 7 super(KeyVaultTestCase, self).setUp() - @staticmethod - def await_prepared_test(test_fn): - """Synchronous wrapper for async test methods. Used to avoid making changes - upstream to AbstractPreparer (which doesn't await the functions it wraps) - """ - - @functools.wraps(test_fn) - def run(test_class_instance, *args, **kwargs): - loop = asyncio.get_event_loop() - client = kwargs.get("client") - result = loop.run_until_complete(test_fn(test_class_instance, *args, **kwargs)) - if client: - loop.run_until_complete(client.close()) - return result - - return run - async def _poll_until_no_exception(self, fn, *resource_names, expected_exception, max_retries=20, retry_delay=3): """polling helper for live tests because some operations take an unpredictable amount of time to complete""" 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 4b074f5fa8a0..adecf8374798 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 @@ -175,7 +175,6 @@ def _validate_certificate_issuer_properties(self, a, b): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_crud_operations(self, client, **kwargs): cert_name = self.get_resource_name("cert") lifetime_actions = [LifetimeAction(lifetime_percentage=80, action=CertificatePolicyAction.auto_renew)] @@ -230,7 +229,6 @@ async def test_crud_operations(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_list(self, client, **kwargs): max_certificates = self.list_test_size @@ -260,7 +258,6 @@ async def test_list(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_list_certificate_versions(self, client, **kwargs): cert_name = self.get_resource_name("certver") @@ -296,7 +293,6 @@ async def test_list_certificate_versions(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_crud_contacts(self, client, **kwargs): contact_list = [ CertificateContact(email="admin@contoso.com", name="John Doe", phone="1111111111"), @@ -326,7 +322,6 @@ async def test_crud_contacts(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_recover_and_purge(self, client, **kwargs): certs = {} # create certificates to recover @@ -379,7 +374,6 @@ async def test_recover_and_purge(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_async_request_cancellation_and_deletion(self, client, **kwargs): cert_name = "asyncCanceledDeletedCert" cert_policy = CertificatePolicy.get_default() @@ -439,7 +433,6 @@ async def test_async_request_cancellation_and_deletion(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_policy(self, client, **kwargs): cert_name = "policyCertificate" cert_policy = CertificatePolicy( @@ -476,7 +469,6 @@ async def test_policy(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_get_pending_certificate_signing_request(self, client, **kwargs): cert_name = "unknownIssuerCert" @@ -489,7 +481,6 @@ async def test_get_pending_certificate_signing_request(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer(enable_soft_delete=False) @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_backup_restore(self, client, **kwargs): cert_name = self.get_resource_name("cert") policy = CertificatePolicy.get_default() @@ -511,7 +502,6 @@ async def test_backup_restore(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_crud_issuer(self, client, **kwargs): issuer_name = "issuer" admin_contacts = [ @@ -591,7 +581,6 @@ async def test_crud_issuer(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer(client_kwargs={"logging_enable": True}) - @KeyVaultTestCase.await_prepared_test async def test_logging_enabled(self, client, **kwargs): mock_handler = MockHandler() @@ -616,7 +605,6 @@ async def test_logging_enabled(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_logging_disabled(self, client, **kwargs): mock_handler = MockHandler() 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 d331a3807b40..46fb6497c7d7 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 @@ -38,7 +38,6 @@ class TestExamplesKeyVault(KeyVaultTestCase): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_example_certificate_crud_operations(self, client, **kwargs): certificate_client = client @@ -108,7 +107,6 @@ async def test_example_certificate_crud_operations(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_example_certificate_list_operations(self, client, **kwargs): certificate_client = client @@ -175,7 +173,6 @@ async def test_example_certificate_list_operations(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer(enable_soft_delete=False) @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_example_certificate_backup_restore(self, client, **kwargs): certificate_client = client @@ -224,7 +221,6 @@ async def test_example_certificate_backup_restore(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_example_certificate_recover(self, client, **kwargs): certificate_client = client @@ -268,7 +264,6 @@ async def test_example_certificate_recover(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_example_contacts(self, client, **kwargs): certificate_client = client @@ -315,7 +310,6 @@ async def test_example_contacts(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_example_issuers(self, client, **kwargs): certificate_client = client diff --git a/sdk/keyvault/azure-keyvault-certificates/tests/test_merge_certificate_async.py b/sdk/keyvault/azure-keyvault-certificates/tests/test_merge_certificate_async.py index 59397a909f5f..6da83c3f2003 100644 --- a/sdk/keyvault/azure-keyvault-certificates/tests/test_merge_certificate_async.py +++ b/sdk/keyvault/azure-keyvault-certificates/tests/test_merge_certificate_async.py @@ -22,7 +22,6 @@ def __init__(self, *args, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer(CertificateClient) - @KeyVaultTestCase.await_prepared_test async def test_merge_certificate(self, client, **kwargs): cert_name = "mergeCertificate" cert_policy = CertificatePolicy( diff --git a/sdk/keyvault/azure-keyvault-keys/tests/_shared/test_case_async.py b/sdk/keyvault/azure-keyvault-keys/tests/_shared/test_case_async.py index 4462e8aa8667..07991be314ff 100644 --- a/sdk/keyvault/azure-keyvault-keys/tests/_shared/test_case_async.py +++ b/sdk/keyvault/azure-keyvault-keys/tests/_shared/test_case_async.py @@ -3,11 +3,9 @@ # Licensed under the MIT License. # ------------------------------------ import asyncio -import functools from azure_devtools.scenario_tests.patches import mock_in_unit_test from devtools_testutils import AzureMgmtTestCase -from .helpers_async import get_completed_future def skip_sleep(unit_test): @@ -26,23 +24,6 @@ def setUp(self): self.list_test_size = 7 super(KeyVaultTestCase, self).setUp() - @staticmethod - def await_prepared_test(test_fn): - """Synchronous wrapper for async test methods. Used to avoid making changes - upstream to AbstractPreparer (which doesn't await the functions it wraps) - """ - - @functools.wraps(test_fn) - def run(test_class_instance, *args, **kwargs): - loop = asyncio.get_event_loop() - client = kwargs.get("client") - result = loop.run_until_complete(test_fn(test_class_instance, *args, **kwargs)) - if client: - loop.run_until_complete(client.close()) - return result - - return run - async def _poll_until_no_exception(self, fn, *resource_names, expected_exception, max_retries=20, retry_delay=3): """polling helper for live tests because some operations take an unpredictable amount of time to complete""" diff --git a/sdk/keyvault/azure-keyvault-keys/tests/test_crypto_client_async.py b/sdk/keyvault/azure-keyvault-keys/tests/test_crypto_client_async.py index e470e1304826..1f069d86e781 100644 --- a/sdk/keyvault/azure-keyvault-keys/tests/test_crypto_client_async.py +++ b/sdk/keyvault/azure-keyvault-keys/tests/test_crypto_client_async.py @@ -8,10 +8,11 @@ import os from azure.keyvault.keys import JsonWebKey, KeyCurveName, KeyVaultKey -from azure.keyvault.keys.aio import KeyClient from azure.keyvault.keys.crypto.aio import CryptographyClient, EncryptionAlgorithm, KeyWrapAlgorithm, SignatureAlgorithm from azure.mgmt.keyvault.models import KeyPermissions, Permissions from devtools_testutils import ResourceGroupPreparer, KeyVaultPreparer +import pytest + from _shared.json_attribute_matcher import json_attribute_matcher from _shared.test_case_async import KeyVaultTestCase @@ -79,7 +80,6 @@ def _to_bytes(hex): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer(permissions=NO_GET) @CryptoClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_encrypt_and_decrypt(self, key_client, credential, **kwargs): # TODO: use iv, authentication_data key_name = self.get_resource_name("keycrypt") @@ -98,7 +98,6 @@ async def test_encrypt_and_decrypt(self, key_client, credential, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer(permissions=NO_GET) @CryptoClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_sign_and_verify(self, key_client, credential, **kwargs): key_name = self.get_resource_name("keysign") @@ -120,7 +119,6 @@ async def test_sign_and_verify(self, key_client, credential, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer(permissions=NO_GET) @CryptoClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_wrap_and_unwrap(self, key_client, credential, **kwargs): key_name = self.get_resource_name("keywrap") @@ -136,27 +134,9 @@ async def test_wrap_and_unwrap(self, key_client, credential, **kwargs): result = await crypto_client.unwrap_key(result.algorithm, result.encrypted_key) self.assertEqual(key_bytes, result.key) - @KeyVaultTestCase.await_prepared_test - async def test_symmetric_wrap_and_unwrap_local(self, *args, **kwargs): - key = KeyVaultKey( - key_id="http://fake.test.vault/keys/key/version", - k=os.urandom(32), - kty="oct", - key_ops=["unwrapKey", "wrapKey"], - ) - - crypto_client = CryptographyClient(key, credential=lambda *_: None) - - # Wrap a key with the created key, then unwrap it. The wrapped key's bytes should round-trip. - key_bytes = os.urandom(32) - wrap_result = await crypto_client.wrap_key(KeyWrapAlgorithm.aes_256, key_bytes) - unwrap_result = await crypto_client.unwrap_key(wrap_result.algorithm, wrap_result.encrypted_key) - self.assertEqual(unwrap_result.key, key_bytes) - @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @CryptoClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_encrypt_local(self, key_client, credential, **kwargs): """Encrypt locally, decrypt with Key Vault""" @@ -173,7 +153,6 @@ async def test_encrypt_local(self, key_client, credential, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @CryptoClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_wrap_local(self, key_client, credential, **kwargs): """Wrap locally, unwrap with Key Vault""" @@ -190,7 +169,6 @@ async def test_wrap_local(self, key_client, credential, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @CryptoClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_rsa_verify_local(self, key_client, credential, **kwargs): """Sign with Key Vault, verify locally""" @@ -216,7 +194,6 @@ async def test_rsa_verify_local(self, key_client, credential, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @CryptoClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_ec_verify_local(self, key_client, credential, **kwargs): """Sign with Key Vault, verify locally""" @@ -238,3 +215,21 @@ async def test_ec_verify_local(self, key_client, credential, **kwargs): result = await crypto_client.verify(result.algorithm, digest, result.signature) self.assertTrue(result.is_valid) + + +@pytest.mark.asyncio +async def test_symmetric_wrap_and_unwrap_local(): + key = KeyVaultKey( + key_id="http://fake.test.vault/keys/key/version", + k=os.urandom(32), + kty="oct", + key_ops=["unwrapKey", "wrapKey"], + ) + + crypto_client = CryptographyClient(key, credential=lambda *_: None) + + # Wrap a key with the created key, then unwrap it. The wrapped key's bytes should round-trip. + key_bytes = os.urandom(32) + wrap_result = await crypto_client.wrap_key(KeyWrapAlgorithm.aes_256, key_bytes) + unwrap_result = await crypto_client.unwrap_key(wrap_result.algorithm, wrap_result.encrypted_key) + assert unwrap_result.key == key_bytes diff --git a/sdk/keyvault/azure-keyvault-keys/tests/test_examples_crypto_async.py b/sdk/keyvault/azure-keyvault-keys/tests/test_examples_crypto_async.py index b3596b0f639e..47111080ee92 100644 --- a/sdk/keyvault/azure-keyvault-keys/tests/test_examples_crypto_async.py +++ b/sdk/keyvault/azure-keyvault-keys/tests/test_examples_crypto_async.py @@ -23,7 +23,6 @@ def __init__(self, *args, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @CryptoClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_encrypt_decrypt_async(self, key_client, credential, **kwargs): key_name = self.get_resource_name("crypto-test-encrypt-key") key = await key_client.create_rsa_key(key_name) @@ -55,7 +54,6 @@ async def test_encrypt_decrypt_async(self, key_client, credential, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @CryptoClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_wrap_unwrap_async(self, key_client, credential, **kwargs): key_name = self.get_resource_name("crypto-test-wrapping-key") key = await key_client.create_rsa_key(key_name) @@ -85,7 +83,6 @@ async def test_wrap_unwrap_async(self, key_client, credential, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @CryptoClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_sign_verify_async(self, key_client, credential, **kwargs): key_name = self.get_resource_name("crypto-test-wrapping-key") key = await key_client.create_rsa_key(key_name) diff --git a/sdk/keyvault/azure-keyvault-keys/tests/test_keys_async.py b/sdk/keyvault/azure-keyvault-keys/tests/test_keys_async.py index fa39fff862f7..8020ccecd8ae 100644 --- a/sdk/keyvault/azure-keyvault-keys/tests/test_keys_async.py +++ b/sdk/keyvault/azure-keyvault-keys/tests/test_keys_async.py @@ -171,7 +171,6 @@ def _to_bytes(hex): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_key_crud_operations(self, client, **kwargs): self.assertIsNotNone(client) @@ -221,7 +220,6 @@ async def test_key_crud_operations(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_key_list(self, client, **kwargs): self.assertIsNotNone(client) @@ -245,7 +243,6 @@ async def test_key_list(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_list_versions(self, client, **kwargs): self.assertIsNotNone(client) key_name = self.get_resource_name("testKey") @@ -271,7 +268,6 @@ async def test_list_versions(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_list_deleted_keys(self, client, **kwargs): self.assertIsNotNone(client) key_name = self.get_resource_name("sec") @@ -303,7 +299,6 @@ async def test_list_deleted_keys(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer(enable_soft_delete=False) @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_backup_restore(self, client, **kwargs): self.assertIsNotNone(client) key_name = self.get_resource_name("keybak") @@ -328,7 +323,6 @@ async def test_backup_restore(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_recover(self, client, **kwargs): self.assertIsNotNone(client) keys = {} @@ -359,7 +353,6 @@ async def test_recover(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_purge(self, client, **kwargs): self.assertIsNotNone(client) @@ -381,7 +374,6 @@ async def test_purge(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer(client_kwargs={"logging_enable": True}) - @KeyVaultTestCase.await_prepared_test async def test_logging_enabled(self, client, **kwargs): mock_handler = MockHandler() @@ -406,7 +398,6 @@ async def test_logging_enabled(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_logging_disabled(self, client, **kwargs): mock_handler = MockHandler() diff --git a/sdk/keyvault/azure-keyvault-keys/tests/test_samples_keys_async.py b/sdk/keyvault/azure-keyvault-keys/tests/test_samples_keys_async.py index d76e31d502ff..7ee7fb733b5f 100644 --- a/sdk/keyvault/azure-keyvault-keys/tests/test_samples_keys_async.py +++ b/sdk/keyvault/azure-keyvault-keys/tests/test_samples_keys_async.py @@ -40,7 +40,6 @@ class TestExamplesKeyVault(KeyVaultTestCase): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_example_key_crud_operations(self, client, **kwargs): key_client = client # [START create_key] @@ -133,7 +132,6 @@ async def test_example_key_crud_operations(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_example_key_list_operations(self, client, **kwargs): key_client = client @@ -184,7 +182,6 @@ async def test_example_key_list_operations(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer(enable_soft_delete=False) @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_example_keys_backup_restore(self, client, **kwargs): key_client = client key_name = "test-key" @@ -214,7 +211,6 @@ async def test_example_keys_backup_restore(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_example_keys_recover(self, client, **kwargs): key_client = client created_key = await key_client.create_key("key-name", "RSA") diff --git a/sdk/keyvault/azure-keyvault-secrets/tests/_shared/test_case_async.py b/sdk/keyvault/azure-keyvault-secrets/tests/_shared/test_case_async.py index 4462e8aa8667..07991be314ff 100644 --- a/sdk/keyvault/azure-keyvault-secrets/tests/_shared/test_case_async.py +++ b/sdk/keyvault/azure-keyvault-secrets/tests/_shared/test_case_async.py @@ -3,11 +3,9 @@ # Licensed under the MIT License. # ------------------------------------ import asyncio -import functools from azure_devtools.scenario_tests.patches import mock_in_unit_test from devtools_testutils import AzureMgmtTestCase -from .helpers_async import get_completed_future def skip_sleep(unit_test): @@ -26,23 +24,6 @@ def setUp(self): self.list_test_size = 7 super(KeyVaultTestCase, self).setUp() - @staticmethod - def await_prepared_test(test_fn): - """Synchronous wrapper for async test methods. Used to avoid making changes - upstream to AbstractPreparer (which doesn't await the functions it wraps) - """ - - @functools.wraps(test_fn) - def run(test_class_instance, *args, **kwargs): - loop = asyncio.get_event_loop() - client = kwargs.get("client") - result = loop.run_until_complete(test_fn(test_class_instance, *args, **kwargs)) - if client: - loop.run_until_complete(client.close()) - return result - - return run - async def _poll_until_no_exception(self, fn, *resource_names, expected_exception, max_retries=20, retry_delay=3): """polling helper for live tests because some operations take an unpredictable amount of time to complete""" diff --git a/sdk/keyvault/azure-keyvault-secrets/tests/test_samples_secrets_async.py b/sdk/keyvault/azure-keyvault-secrets/tests/test_samples_secrets_async.py index 570afa1de1b1..400a5e0728c4 100644 --- a/sdk/keyvault/azure-keyvault-secrets/tests/test_samples_secrets_async.py +++ b/sdk/keyvault/azure-keyvault-secrets/tests/test_samples_secrets_async.py @@ -39,7 +39,6 @@ class TestExamplesKeyVault(KeyVaultTestCase): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_example_secret_crud_operations(self, client, **kwargs): secret_client = client @@ -106,7 +105,6 @@ async def test_example_secret_crud_operations(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_example_secret_list_operations(self, client, **kwargs): secret_client = client @@ -155,7 +153,6 @@ async def test_example_secret_list_operations(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer(enable_soft_delete=False) @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_example_secrets_backup_restore(self, client, **kwargs): secret_client = client created_secret = await secret_client.set_secret("secret-name", "secret-value") @@ -184,7 +181,6 @@ async def test_example_secrets_backup_restore(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_example_secrets_recover(self, client, **kwargs): secret_client = client created_secret = await secret_client.set_secret("secret-name", "secret-value") diff --git a/sdk/keyvault/azure-keyvault-secrets/tests/test_secrets_async.py b/sdk/keyvault/azure-keyvault-secrets/tests/test_secrets_async.py index 4b5eabe9b82b..9b98be922e83 100644 --- a/sdk/keyvault/azure-keyvault-secrets/tests/test_secrets_async.py +++ b/sdk/keyvault/azure-keyvault-secrets/tests/test_secrets_async.py @@ -71,7 +71,6 @@ async def _validate_secret_list(self, secrets, expected): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_secret_crud_operations(self, client, **kwargs): secret_name = "crud-secret" secret_value = self.get_resource_name("crud_secret_value") @@ -135,7 +134,6 @@ async def _update_secret(secret): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_secret_list(self, client, **kwargs): max_secrets = self.list_test_size expected = {} @@ -156,7 +154,6 @@ async def test_secret_list(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_list_deleted_secrets(self, client, **kwargs): expected = {} @@ -181,7 +178,6 @@ async def test_list_deleted_secrets(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_list_versions(self, client, **kwargs): secret_name = self.get_resource_name("sec") secret_value = self.get_resource_name("secVal") @@ -210,7 +206,6 @@ async def test_list_versions(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer(enable_soft_delete=False) @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_backup_restore(self, client, **kwargs): secret_name = self.get_resource_name("secbak") secret_value = self.get_resource_name("secVal") @@ -233,7 +228,6 @@ async def test_backup_restore(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_recover(self, client, **kwargs): secrets = {} @@ -263,7 +257,6 @@ async def test_recover(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_purge(self, client, **kwargs): secrets = {} @@ -288,7 +281,6 @@ async def test_purge(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer(client_kwargs={"logging_enable": True}) - @KeyVaultTestCase.await_prepared_test async def test_logging_enabled(self, client, **kwargs): mock_handler = MockHandler() @@ -313,7 +305,6 @@ async def test_logging_enabled(self, client, **kwargs): @ResourceGroupPreparer(random_name_enabled=True) @KeyVaultPreparer() @KeyVaultClientPreparer() - @KeyVaultTestCase.await_prepared_test async def test_logging_disabled(self, client, **kwargs): mock_handler = MockHandler()