Skip to content
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

fix: require the same object to be in the testing state as in the event #1468

Merged
merged 1 commit into from
Nov 27, 2024
Merged

fix: require the same object to be in the testing state as in the event #1468

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 13 additions & 9 deletions testing/src/scenario/_consistency_checker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,11 @@ def _check_relation_event(
f"relation event should start with relation endpoint name. {event.name} does "
f"not start with {event.relation.endpoint}.",
)
if event.relation.id not in {rel.id for rel in state.relations}:
if event.relation not in state.relations:
errors.append(
f"cannot emit {event.name} because relation {event.relation.id} is not in the state.",
f"cannot emit {event.name} because relation {event.relation.id} is not in the "
f"state (a relation with the same ID is not sufficient - you must "
f"pass the object in the state to the event).",
)


Expand All @@ -241,7 +243,8 @@ def _check_workload_event(
if event.container not in state.containers:
errors.append(
f"cannot emit {event.name} because container {event.container.name} "
f"is not in the state.",
f"is not in the state (a container with the same name is not "
f"sufficient - you must pass the object in the state to the event).",
)
if not event.container.can_connect:
warnings.append(
Expand Down Expand Up @@ -310,12 +313,11 @@ def _check_storage_event(
f"storage event {event.name} refers to storage {storage.name} "
f"which is not declared in the charm metadata (metadata.yaml) under 'storage'.",
)
elif (storage.name, storage.index) not in {
(s.name, s.index) for s in state.storages
}:
elif storage not in state.storages:
errors.append(
f"cannot emit {event.name} because storage {storage.name} "
f"is not in the state.",
f"is not in the state (an object with the same name and index is not "
f"sufficient - you must pass the object in the state to the event).",
)


Expand Down Expand Up @@ -479,10 +481,12 @@ def check_secrets_consistency(
return Results(errors, [])

assert event.secret is not None
if event.secret.id not in {s.id for s in state.secrets}:
if event.secret not in state.secrets:
secret_key = event.secret.id if event.secret.id else event.secret.label
errors.append(
f"cannot emit {event.name} because secret {secret_key} is not in the state.",
f"cannot emit {event.name} because secret {secret_key} is not in the state "
f"(a secret with the same ID is not sufficient - you must pass the object "
f"in the state to the event).",
)
elif juju_version < (3,):
errors.append(
Expand Down