Skip to content

[DPE-8426] Fix refresh tests #1248

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
merged 4 commits into from
Oct 22, 2025
Merged

[DPE-8426] Fix refresh tests #1248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe188e8
Run resume refresh on the last unit
dragomirp Oct 21, 2025
38a7b50
Merge branch '16/edge' into fix-resume-refresh
dragomirp Oct 21, 2025
84329d3
Try last unit
dragomirp Oct 21, 2025
9269195
Always wait
dragomirp Oct 21, 2025
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/high_availability/test_async_replication_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ def run_upgrade_from_edge(juju: Juju, app_name: str, charm: str) -> None:
wait=5 * MINUTE_SECS,
)

juju.wait(jubilant.all_agents_idle, timeout=5 * MINUTE_SECS)
juju.wait(jubilant.all_agents_idle, timeout=5 * MINUTE_SECS)

logging.info("Run resume-refresh action")
juju.run(unit=unit_names[1], action="resume-refresh", wait=5 * MINUTE_SECS)
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/high_availability/test_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def test_upgrade_from_edge(juju: Juju, charm: str, continuous_writes) -> None:
wait=5 * MINUTE_SECS,
)

juju.wait(jubilant.all_agents_idle, timeout=5 * MINUTE_SECS)
juju.wait(jubilant.all_agents_idle, timeout=5 * MINUTE_SECS)

logging.info("Run resume-refresh action")
juju.run(unit=unit_names[1], action="resume-refresh", wait=5 * MINUTE_SECS)
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/high_availability/test_upgrade_from_stable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def test_upgrade_from_stable(juju: Juju, charm: str, continuous_writes) -> None:
wait=5 * MINUTE_SECS,
)

juju.wait(jubilant.all_agents_idle, timeout=5 * MINUTE_SECS)
juju.wait(jubilant.all_agents_idle, timeout=5 * MINUTE_SECS)

logging.info("Run resume-refresh action")
juju.run(unit=unit_names[1], action="resume-refresh", wait=5 * MINUTE_SECS)
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/high_availability/test_upgrade_skip_pre_upgrade_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def test_refresh_without_pre_refresh_check(juju: Juju, charm: str, continuous_wr
wait=5 * MINUTE_SECS,
)

juju.wait(jubilant.all_agents_idle, timeout=5 * MINUTE_SECS)
juju.wait(jubilant.all_agents_idle, timeout=5 * MINUTE_SECS)

logging.info("Run resume-refresh action")
juju.run(unit=unit_names[1], action="resume-refresh", wait=5 * MINUTE_SECS)
Expand Down Expand Up @@ -123,7 +123,7 @@ async def test_rollback_without_pre_refresh_check(
wait=5 * MINUTE_SECS,
)

juju.wait(jubilant.all_agents_idle, timeout=5 * MINUTE_SECS)
juju.wait(jubilant.all_agents_idle, timeout=5 * MINUTE_SECS)

logging.info("Run resume-refresh action")
juju.run(unit=unit_names[1], action="resume-refresh", wait=5 * MINUTE_SECS)
Expand Down