[DPE-6666] Remove async-replication test workaround (#588)

Author: sinclert-canonical

tests/integration/high_availability/test_async_replication.py

@@ -151,35 +151,6 @@ async def test_async_relate(ops_test: OpsTest, first_model: Model, second_model:
     )
 
 
-@markers.juju3
-@pytest.mark.abort_on_fail
-async def test_create_replication(first_model: Model, second_model: Model) -> None:
-    """Run the create replication and wait for the applications to settle."""
-    logger.info("Running create replication action")
-    leader_unit = await get_leader_unit(None, MYSQL_APP1, first_model)
-    assert leader_unit is not None, "No leader unit found"
-
-    await juju_.run_action(
-        leader_unit,
-        "create-replication",
-        **{"--wait": "5m"},
-    )
-
-    logger.info("Waiting for the applications to settle")
-    await gather(
-        first_model.wait_for_idle(
-            apps=[MYSQL_APP1],
-            status="active",
-            timeout=5 * MINUTE,
-        ),
-        second_model.wait_for_idle(
-            apps=[MYSQL_APP2],
-            status="active",
-            timeout=5 * MINUTE,
-        ),
-    )
-
-
 @markers.juju3
 @pytest.mark.abort_on_fail
 async def test_deploy_router_and_app(first_model: Model) -> None:
@@ -216,6 +187,35 @@ async def test_deploy_router_and_app(first_model: Model) -> None:
     )
 
 
+@markers.juju3
+@pytest.mark.abort_on_fail
+async def test_create_replication(first_model: Model, second_model: Model) -> None:
+    """Run the create replication and wait for the applications to settle."""
+    logger.info("Running create replication action")
+    leader_unit = await get_leader_unit(None, MYSQL_APP1, first_model)
+    assert leader_unit is not None, "No leader unit found"
+
+    await juju_.run_action(
+        leader_unit,
+        "create-replication",
+        **{"--wait": "5m"},
+    )
+
+    logger.info("Waiting for the applications to settle")
+    await gather(
+        first_model.wait_for_idle(
+            apps=[MYSQL_APP1],
+            status="active",
+            timeout=5 * MINUTE,
+        ),
+        second_model.wait_for_idle(
+            apps=[MYSQL_APP2],
+            status="active",
+            timeout=5 * MINUTE,
+        ),
+    )
+
+
 @markers.juju3
 @pytest.mark.abort_on_fail
 async def test_data_replication(
@@ -317,14 +317,6 @@ async def test_remove_relation_and_relate(
     first_model: Model, second_model: Model, continuous_writes
 ) -> None:
     """Test removing and re-relating the two mysql clusters."""
-    logger.info("Stopping continuous writes after 5s")
-    # part 1/2 of workaround for https://github.com/canonical/mysql-k8s-operator/issues/399
-    # sleep is need to ensure there is enough time for the `continuous_writes` database be
-    # created/populated (by the fixture) before stopping the continuous writes
-    sleep(5)
-    application_unit = first_model.applications[APPLICATION_APP_NAME].units[0]
-    await juju_.run_action(application_unit, "stop-continuous-writes")
-
     logger.info("Remove async relation")
     await second_model.applications[MYSQL_APP2].remove_relation(
         f"{MYSQL_APP2}:replication", MYSQL_APP1
@@ -387,9 +379,6 @@ async def test_remove_relation_and_relate(
         ),
     )
 
-    # part 2/2 of workaround for https://github.com/canonical/mysql-k8s-operator/issues/399
-    await juju_.run_action(application_unit, "start-continuous-writes")
-
     results = await get_max_written_value(first_model, second_model)
     assert len(results) == 6, f"Expected 6 results, got {len(results)}"
     assert all(x == results[0] for x in results), "Data is not consistent across units"