Skip to content

Remove unnecessary ffwd in upgrade integration tests #25

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 1 commit into from
Sep 2, 2025
Merged

Remove unnecessary ffwd in upgrade integration tests #25

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
21 changes: 3 additions & 18 deletions kubernetes/tests/integration/test_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,7 @@ async def test_upgrade_from_edge(ops_test: OpsTest, charm) -> None:
)

logger.info("Wait for first unit to restart")
async with ops_test.fast_forward("60s"):
await ops_test.model.wait_for_idle(
[MYSQL_ROUTER_APP_NAME],
idle_period=30,
timeout=5 * 60,
)
await ops_test.model.wait_for_idle([MYSQL_ROUTER_APP_NAME], idle_period=30, timeout=5 * 60)

# Refresh will be incompatible on PR CI (not edge CI) since unreleased charm versions are
# always marked as incompatible
Expand All @@ -134,12 +129,7 @@ async def test_upgrade_from_edge(ops_test: OpsTest, charm) -> None:
await run_action(refresh_order[0], "force-refresh-start", **{"check-compatibility": False})

logger.info("Wait for first unit to upgrade")
async with ops_test.fast_forward("60s"):
await ops_test.model.wait_for_idle(
[MYSQL_ROUTER_APP_NAME],
idle_period=30,
timeout=TIMEOUT,
)
await ops_test.model.wait_for_idle([MYSQL_ROUTER_APP_NAME], idle_period=30, timeout=TIMEOUT)

mysql_router_leader_unit = await get_leader_unit(ops_test, MYSQL_ROUTER_APP_NAME)
logger.info("Running resume-refresh on the mysql router leader unit")
Expand Down Expand Up @@ -222,12 +212,7 @@ async def test_fail_and_rollback(ops_test: OpsTest, charm, continuous_writes) ->
)

logger.info("Wait for first unit to rollback")
async with ops_test.fast_forward("60s"):
await ops_test.model.wait_for_idle(
[MYSQL_ROUTER_APP_NAME],
idle_period=30,
timeout=TIMEOUT,
)
await ops_test.model.wait_for_idle([MYSQL_ROUTER_APP_NAME], idle_period=30, timeout=TIMEOUT)

mysql_router_leader_unit = await get_leader_unit(ops_test, MYSQL_ROUTER_APP_NAME)
logger.info("Running resume-refresh on the mysql router leader unit")
Expand Down