From d399f661d4cb1544775cf5c62f6f90b89f0e3900 Mon Sep 17 00:00:00 2001 From: Carl Csaposs Date: Mon, 1 Sep 2025 17:34:36 +0200 Subject: [PATCH] Remove unnecessary ffwd in upgrade integration tests More frequent update-status events will not help these conditions be met faster From https://github.com/canonical/mysql-router-k8s-operator/pull/411#discussion_r2309323312 --- kubernetes/tests/integration/test_upgrade.py | 21 +++----------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/kubernetes/tests/integration/test_upgrade.py b/kubernetes/tests/integration/test_upgrade.py index 2cb14a34..9f17b366 100644 --- a/kubernetes/tests/integration/test_upgrade.py +++ b/kubernetes/tests/integration/test_upgrade.py @@ -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 @@ -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") @@ -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")