@@ -117,12 +117,7 @@ async def test_upgrade_from_edge(ops_test: OpsTest, charm) -> None:
117117 )
118118
119119 logger .info ("Wait for first unit to restart" )
120- async with ops_test .fast_forward ("60s" ):
121- await ops_test .model .wait_for_idle (
122- [MYSQL_ROUTER_APP_NAME ],
123- idle_period = 30 ,
124- timeout = 5 * 60 ,
125- )
120+ await ops_test .model .wait_for_idle ([MYSQL_ROUTER_APP_NAME ], idle_period = 30 , timeout = 5 * 60 )
126121
127122 # Refresh will be incompatible on PR CI (not edge CI) since unreleased charm versions are
128123 # always marked as incompatible
@@ -134,12 +129,7 @@ async def test_upgrade_from_edge(ops_test: OpsTest, charm) -> None:
134129 await run_action (refresh_order [0 ], "force-refresh-start" , ** {"check-compatibility" : False })
135130
136131 logger .info ("Wait for first unit to upgrade" )
137- async with ops_test .fast_forward ("60s" ):
138- await ops_test .model .wait_for_idle (
139- [MYSQL_ROUTER_APP_NAME ],
140- idle_period = 30 ,
141- timeout = TIMEOUT ,
142- )
132+ await ops_test .model .wait_for_idle ([MYSQL_ROUTER_APP_NAME ], idle_period = 30 , timeout = TIMEOUT )
143133
144134 mysql_router_leader_unit = await get_leader_unit (ops_test , MYSQL_ROUTER_APP_NAME )
145135 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) ->
222212 )
223213
224214 logger .info ("Wait for first unit to rollback" )
225- async with ops_test .fast_forward ("60s" ):
226- await ops_test .model .wait_for_idle (
227- [MYSQL_ROUTER_APP_NAME ],
228- idle_period = 30 ,
229- timeout = TIMEOUT ,
230- )
215+ await ops_test .model .wait_for_idle ([MYSQL_ROUTER_APP_NAME ], idle_period = 30 , timeout = TIMEOUT )
231216
232217 mysql_router_leader_unit = await get_leader_unit (ops_test , MYSQL_ROUTER_APP_NAME )
233218 logger .info ("Running resume-refresh on the mysql router leader unit" )
0 commit comments