Skip to content

Commit 8f5d559

Browse files
committed
merge fix
1 parent 6903573 commit 8f5d559

File tree

6 files changed

+6
-429
lines changed

6 files changed

+6
-429
lines changed

codebuild/py312/examples_mpl.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Runs the same tests as examples in an environment with the MPL installed
2+
# to assert existing tests continue to pass with the MPL installed.
3+
# Then, run MPL-specific tests.
14
version: 0.2
25

36
env:

examples/src/keyrings/example_branch_key_id_supplier.py

Lines changed: 0 additions & 41 deletions
This file was deleted.

examples/src/keyrings/hierarchical_keyring.py

Lines changed: 0 additions & 235 deletions
This file was deleted.

examples/test/keyrings/test_i_hierarchical_keyring.py

Lines changed: 0 additions & 14 deletions
This file was deleted.

test/mpl/unit/test_material_managers_mpl_cmm.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,12 @@ def test_GIVEN_valid_mpl_commitment_policy_WHEN_native_to_mpl_get_encryption_mat
147147
assert output.algorithm_suite_id == mock_mpl_algorithm()
148148

149149

150-
def test_GIVEN_CommitmentPolicy_FORBID_ENCRYPT_ALLOW_DECRYPT_WHEN_native_to_mpl_commmitment_policy_THEN_returns_MPL_CommitmentPolicyESDK_FORBID_ENCRYPT_ALLOW_DECRYPT(): # noqa: E501
150+
def test_GIVEN_CommitmentPolicy_FORBID_ENCRYPT_ALLOW_DECRYPT_WHEN_native_to_mpl_commitment_policy_THEN_returns_MPL_CommitmentPolicyESDK_FORBID_ENCRYPT_ALLOW_DECRYPT(): # noqa: E501
151151
# Given: native FORBID_ENCRYPT_ALLOW_DECRYPT
152152
native_commitment_policy = CommitmentPolicy.FORBID_ENCRYPT_ALLOW_DECRYPT
153153

154-
# When: _native_to_mpl_commmitment_policy
155-
output = CryptoMaterialsManagerFromMPL._native_to_mpl_commmitment_policy(native_commitment_policy)
154+
# When: _native_to_mpl_commitment_policy
155+
output = CryptoMaterialsManagerFromMPL._native_to_mpl_commitment_policy(native_commitment_policy)
156156

157157
# Then: Returns MPL FORBID_ENCRYPT_ALLOW_DECRYPT
158158
assert isinstance(output, MPL_CommitmentPolicyESDK)

0 commit comments

Comments
 (0)