Skip to content

chore(CI): Fix TestVectors timeout #711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lucasmcdonald3 merged 2 commits into from
Oct 28, 2024
Merged

chore(CI): Fix TestVectors timeout #711

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd873a0
m
lucasmcdonald3 Oct 28, 2024
8e5960e
m
lucasmcdonald3 Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,21 +630,11 @@ def from_file(cls, input_file, keyrings):
client_name = raw_manifest["client"]["name"] # type: str
client_version = raw_manifest["client"]["version"] # type: str
raw_scenarios = raw_manifest["tests"] # type: Dict[str, DECRYPT_SCENARIO_SPEC]
test_scenarios = {
name: MessageDecryptionTestScenario.from_scenario(
scenario=scenario,
plaintext_reader=root_reader,
ciphertext_reader=root_reader,
keys=keys,
keyrings=False,
keys_uri=keys_abs_path,
)
for name, scenario in raw_scenarios.items()
}
# If optional keyrings argument is true,
# also add scenarios to decrypt with keyrings.

# If optional keyrings argument is specified,
# decrypt with keyrings
if keyrings:
keyrings_test_scenarios = {
test_scenarios = {
name + "-keyring": MessageDecryptionTestScenario.from_scenario(
scenario=scenario,
plaintext_reader=root_reader,
Expand All @@ -655,8 +645,20 @@ def from_file(cls, input_file, keyrings):
)
for name, scenario in raw_scenarios.items()
}
# Merge keyring scenarios into test_scenarios
test_scenarios = {**keyrings_test_scenarios, **test_scenarios}
# If optional keyrings argument is not specified,
# decrypt with master key providers.
else:
test_scenarios = {
name: MessageDecryptionTestScenario.from_scenario(
scenario=scenario,
plaintext_reader=root_reader,
ciphertext_reader=root_reader,
keys=keys,
keyrings=False,
keys_uri=keys_abs_path,
)
for name, scenario in raw_scenarios.items()
}

# Remove any `None` scenarios from test scenarios.
# `None` scenarios indicate the loader determined the scenario is invalid.
Expand Down
Loading