Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion tests/integration/test_charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@ async def test_user_secret_permissions(juju: jubilant.Juju) -> None:
)

logger.info("Secret access will be granted now - wait for updated password")
juju.grant_secret(identifier=secret_name, app=APP_NAME)
# deferred `config_changed` event will be retried before `update_status`
with fast_forward(juju):
juju.grant_secret(identifier=secret_name, app=APP_NAME)
juju.wait(
lambda status: are_apps_active_and_agents_idle(status, APP_NAME, idle_period=10),
timeout=1200,
Expand Down
6 changes: 5 additions & 1 deletion tests/integration/tls/test_certificate_rotation.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ async def test_ca_rotation_by_expiration(juju: jubilant.Juju) -> None:
juju.remove_relation(f"{APP_NAME}:client-certificates", f"{TLS_NAME}:certificates")
juju.wait(
lambda status: are_agents_idle(status, APP_NAME, idle_period=30, unit_count=NUM_UNITS),
timeout=100,
timeout=600,
)

logger.info("Adjust CA and certificate validity on TLS provider")
Expand Down Expand Up @@ -274,6 +274,10 @@ async def test_ca_rotation_by_expiration(juju: jubilant.Juju) -> None:

logger.info("Waiting for CA certificate to expire")
sleep(CA_EXPIRY_TIME)
juju.wait(
lambda status: are_agents_idle(status, APP_NAME, idle_period=10, unit_count=NUM_UNITS),
timeout=600,
)

logger.info("Check access with previous certificate fails after expiration")
with pytest.raises(Exception) as exc_info:
Expand Down
Loading