Skip to content

Commit b5da8aa

Browse files
committed
fix: rename test keyring to avoid name collision
1 parent bc8bfb2 commit b5da8aa

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

test/unit/materials_managers/test_default.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
from ..unit_test_utils import (
3131
BrokenKeyring,
32-
OnlyGenerateKeyring,
32+
NoEncryptedDataKeysKeyring,
3333
ephemeral_raw_aes_keyring,
3434
ephemeral_raw_aes_master_key,
3535
)
@@ -267,7 +267,7 @@ def test_decrypt_materials(mocker, patch_for_dcmm_decrypt):
267267
def test_encrypt_with_keyring_materials_incomplete():
268268
raw_aes256_keyring = ephemeral_raw_aes_keyring(WrappingAlgorithm.AES_256_GCM_IV12_TAG16_NO_PADDING)
269269

270-
encrypt_cmm = DefaultCryptoMaterialsManager(keyring=OnlyGenerateKeyring(inner_keyring=raw_aes256_keyring))
270+
encrypt_cmm = DefaultCryptoMaterialsManager(keyring=NoEncryptedDataKeysKeyring(inner_keyring=raw_aes256_keyring))
271271

272272
encryption_materials_request = EncryptionMaterialsRequest(encryption_context={}, frame_length=1024)
273273

test/unit/unit_test_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ def on_decrypt(self, decryption_materials, encrypted_data_keys):
642642

643643

644644
@attr.s
645-
class OnlyGenerateKeyring(Keyring):
645+
class NoEncryptedDataKeysKeyring(Keyring):
646646
"""Keyring that wraps another keyring and removes any encrypted data keys."""
647647

648648
_inner_keyring = attr.ib(validator=instance_of(Keyring))

0 commit comments

Comments
 (0)