Skip to content

Commit 889f5c0

Browse files
clean
1 parent f631923 commit 889f5c0

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

test/mpl/utils.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import string
66

77
import boto3
8-
import pytest
98
from aws_cryptographic_materialproviders.keystore import KeyStore
109
from aws_cryptographic_materialproviders.keystore.config import KeyStoreConfig
1110
from aws_cryptographic_materialproviders.keystore.models import KMSConfigurationKmsKeyArn
@@ -27,15 +26,12 @@
2726
from cryptography.hazmat.primitives import serialization as crypto_serialization
2827
from cryptography.hazmat.primitives.asymmetric import rsa
2928

30-
31-
pytestmark = [pytest.mark.integ]
32-
33-
3429
# MPL client. Used to create keyrings.
3530
mpl_client: AwsCryptographicMaterialProviders = AwsCryptographicMaterialProviders(
3631
config=MaterialProvidersConfig()
3732
)
3833

34+
3935
class TestKeyringCreator:
4036

4137
# Private raw AES keyring creator.
@@ -57,7 +53,6 @@ def _create_raw_aes_keyring():
5753

5854
return raw_aes_keyring
5955

60-
6156
# Private raw RSA keyring creator.
6257
# Lifted from raw RSA keyring example.
6358
@staticmethod
@@ -97,7 +92,6 @@ def _create_raw_rsa_keyring():
9792

9893
return raw_rsa_keyring
9994

100-
10195
# Private KMS keyring creator.
10296
# Lifted KMS keyring example.
10397
@staticmethod
@@ -114,7 +108,6 @@ def _create_kms_keyring():
114108

115109
return kms_keyring
116110

117-
118111
# Private hierarchical keyring creator.
119112
# Lifted hierarchical keyring example.
120113
@staticmethod
@@ -151,7 +144,6 @@ def _create_hierarchical_keyring():
151144

152145
return hierarchical_keyring
153146

154-
155147
# Private multi-keyring creator.
156148
@staticmethod
157149
def _create_multi_keyring(keyrings):
@@ -161,6 +153,7 @@ def _create_multi_keyring(keyrings):
161153
))
162154
return a
163155

156+
164157
class TestEncryptionContexts:
165158

166159
# Encryption contexts under test
@@ -187,4 +180,4 @@ class TestEncryptionContexts:
187180
AT_LEAST_TWO_ITEMS_ENCRYPTION_CONTEXTS = [
188181
SOME_DOUBLE_ITEM_ENCRYPTION_CONTEXT,
189182
SOME_MANY_ITEM_ENCRYPTION_CONTEXT,
190-
]
183+
]

0 commit comments

Comments
 (0)