Blocking test app

dragomirp · dragomirp · commit 1b85dd3ff8e5 · 2025-07-30T20:55:36.000+03:00
diff --git a/tests/integration/ha_tests/test_async_replication.py b/tests/integration/ha_tests/test_async_replication.py
@@ -133,14 +133,18 @@ async def test_deploy_async_replication_setup(
     )
 
     async with ops_test.fast_forward(), fast_forward(second_model):
+        await gather(
+            first_model.wait_for_idle(apps=[APPLICATION_NAME], status="blocked"),
+            second_model.wait_for_idle(apps=[APPLICATION_NAME], status="blocked"),
+        )
         await gather(
             first_model.wait_for_idle(
-                apps=[DATABASE_APP_NAME, APPLICATION_NAME, DATA_INTEGRATOR_APP_NAME],
+                apps=[DATABASE_APP_NAME, DATA_INTEGRATOR_APP_NAME],
                 status="active",
                 timeout=TIMEOUT,
             ),
             second_model.wait_for_idle(
-                apps=[DATABASE_APP_NAME, APPLICATION_NAME],
+                apps=[DATABASE_APP_NAME],
                 status="active",
                 timeout=TIMEOUT,
             ),
diff --git a/tests/integration/ha_tests/test_replication.py b/tests/integration/ha_tests/test_replication.py
@@ -6,7 +6,13 @@
 from pytest_operator.plugin import OpsTest
 from tenacity import Retrying, stop_after_delay, wait_fixed
 
-from ..helpers import APPLICATION_NAME, CHARM_BASE, db_connect, scale_application
+from ..helpers import (
+    APPLICATION_NAME,
+    CHARM_BASE,
+    DATABASE_APP_NAME,
+    db_connect,
+    scale_application,
+)
 from .helpers import (
     app_name,
     are_writes_increasing,
@@ -46,6 +52,7 @@ async def test_build_and_deploy(ops_test: OpsTest, charm) -> None:
 
     if wait_for_apps:
         async with ops_test.fast_forward():
+            await ops_test.model.relate(DATABASE_APP_NAME, f"{APPLICATION_NAME}:database")
             await ops_test.model.wait_for_idle(status="active", timeout=1500)
 
 
diff --git a/tests/integration/ha_tests/test_scaling.py b/tests/integration/ha_tests/test_scaling.py
@@ -50,6 +50,7 @@ async def test_build_and_deploy(ops_test: OpsTest, charm) -> None:
             ),
         )
 
+        await ops_test.model.relate(DATABASE_APP_NAME, f"{APPLICATION_NAME}:database")
         await ops_test.model.wait_for_idle(status="active", timeout=1500)
 
 
diff --git a/tests/integration/ha_tests/test_scaling_three_units.py b/tests/integration/ha_tests/test_scaling_three_units.py
@@ -52,6 +52,7 @@ async def test_build_and_deploy(ops_test: OpsTest, charm) -> None:
             ),
         )
 
+        await ops_test.model.relate(DATABASE_APP_NAME, f"{APPLICATION_NAME}:database")
         await ops_test.model.wait_for_idle(status="active", timeout=1500)
 
 
diff --git a/tests/integration/ha_tests/test_scaling_three_units_async.py b/tests/integration/ha_tests/test_scaling_three_units_async.py
@@ -52,6 +52,7 @@ async def test_build_and_deploy(ops_test: OpsTest, charm) -> None:
             ),
         )
 
+        await ops_test.model.relate(DATABASE_APP_NAME, f"{APPLICATION_NAME}:database")
         await ops_test.model.wait_for_idle(status="active", timeout=1500)
 
 
diff --git a/tests/integration/ha_tests/test_self_healing.py b/tests/integration/ha_tests/test_self_healing.py
@@ -12,6 +12,7 @@
 from .. import markers
 from ..helpers import (
     CHARM_BASE,
+    DATABASE_APP_NAME,
     db_connect,
     get_machine_from_unit,
     get_password,
@@ -91,6 +92,7 @@ async def test_build_and_deploy(ops_test: OpsTest, charm) -> None:
             )
 
     if wait_for_apps:
+        await ops_test.model.relate(DATABASE_APP_NAME, f"{APPLICATION_NAME}:database")
         async with ops_test.fast_forward():
             await ops_test.model.wait_for_idle(status="active", timeout=1500)
 
diff --git a/tests/integration/ha_tests/test_upgrade.py b/tests/integration/ha_tests/test_upgrade.py
@@ -43,6 +43,7 @@ async def test_deploy_latest(ops_test: OpsTest) -> None:
         num_units=1,
         channel="latest/edge",
     )
+    await ops_test.model.relate(DATABASE_APP_NAME, f"{APPLICATION_NAME}:database")
     logger.info("Wait for applications to become active")
     async with ops_test.fast_forward():
         await ops_test.model.wait_for_idle(
diff --git a/tests/integration/ha_tests/test_upgrade_from_stable.py b/tests/integration/ha_tests/test_upgrade_from_stable.py
@@ -67,6 +67,7 @@ async def test_deploy_stable(ops_test: OpsTest) -> None:
         num_units=1,
         channel="latest/edge",
     )
+    await ops_test.model.relate(DATABASE_APP_NAME, f"{APPLICATION_NAME}:database")
     logger.info("Wait for applications to become active")
     async with ops_test.fast_forward():
         await ops_test.model.wait_for_idle(
diff --git a/tests/integration/new_relations/test_new_relations_1.py b/tests/integration/new_relations/test_new_relations_1.py
@@ -77,7 +77,9 @@ async def test_deploy_charms(ops_test: OpsTest, charm):
             ),
         )
 
-        await ops_test.model.wait_for_idle(apps=APP_NAMES, status="active", timeout=3000)
+        await ops_test.model.wait_for_idle(
+            apps=[DATABASE_APP_NAME, ANOTHER_DATABASE_APP_NAME], status="active", timeout=3000
+        )
 
 
 async def test_primary_read_only_endpoint_in_standalone_cluster(ops_test: OpsTest):
@@ -265,7 +267,6 @@ async def test_two_applications_doesnt_share_the_same_relation_data(ops_test: Op
         channel="latest/edge",
         base=CHARM_BASE,
     )
-    await ops_test.model.wait_for_idle(apps=all_app_names, status="active")
 
     # Relate the new application with the database
     # and wait for them exchanging some connection data.
diff --git a/tests/integration/relations/test_relations.py b/tests/integration/relations/test_relations.py
@@ -37,7 +37,7 @@ async def test_deploy_charms(ops_test: OpsTest, charm):
                 application_name=DATABASE_APP_NAME,
                 num_units=1,
                 base=CHARM_BASE,
-                channel="edge",
+                channel="latest/edge",
             ),
             ops_test.model.deploy(
                 charm,
@@ -55,11 +55,11 @@ async def test_deploy_charms(ops_test: OpsTest, charm):
                 application_name=DB_APP_NAME,
                 num_units=1,
                 base=CHARM_BASE,
-                channel="edge",
+                channel="latest/edge",
             ),
         )
 
-        await ops_test.model.wait_for_idle(apps=APP_NAMES, status="active", timeout=3000)
+        await ops_test.model.wait_for_idle(apps=[APP_NAME], status="active", timeout=3000)
 
 
 async def test_legacy_endpoint_with_multiple_related_endpoints(ops_test: OpsTest):
@@ -78,6 +78,7 @@ async def test_legacy_endpoint_with_multiple_related_endpoints(ops_test: OpsTest
     )
     async with ops_test.fast_forward():
         await ops_test.model.wait_for_idle(
+            apps=[DATABASE_APP_NAME],
             status="active",
             timeout=1500,
             raise_on_error=False,
diff --git a/tests/integration/test_db.py b/tests/integration/test_db.py
@@ -209,9 +209,7 @@ async def test_roles_blocking(ops_test: OpsTest, charm: str) -> None:
     )
 
     await ops_test.model.wait_for_idle(
-        apps=[DATABASE_APP_NAME, APPLICATION_NAME, f"{APPLICATION_NAME}2"],
-        status="active",
-        timeout=1000,
+        apps=[APPLICATION_NAME, f"{APPLICATION_NAME}2"], status="blocked", timeout=1000
     )
 
     await asyncio.gather(
@@ -242,11 +240,7 @@ async def test_roles_blocking(ops_test: OpsTest, charm: str) -> None:
         f"{DATABASE_APP_NAME}:db", f"{APPLICATION_NAME}2:db"
     )
 
-    await ops_test.model.wait_for_idle(
-        apps=[DATABASE_APP_NAME],
-        status="active",
-        timeout=1000,
-    )
+    await ops_test.model.wait_for_idle(apps=[DATABASE_APP_NAME], status="active", timeout=1000)
 
 
 async def test_extensions_blocking(ops_test: OpsTest, charm: str) -> None:
@@ -255,9 +249,7 @@ async def test_extensions_blocking(ops_test: OpsTest, charm: str) -> None:
         ops_test.model.applications[f"{APPLICATION_NAME}2"].set_config({"legacy_roles": "False"}),
     )
     await ops_test.model.wait_for_idle(
-        apps=[APPLICATION_NAME, f"{APPLICATION_NAME}2"],
-        status="active",
-        timeout=1000,
+        apps=[APPLICATION_NAME, f"{APPLICATION_NAME}2"], status="blocked", timeout=1000
     )
 
     await asyncio.gather(
@@ -288,6 +280,8 @@ async def test_extensions_blocking(ops_test: OpsTest, charm: str) -> None:
         f"{DATABASE_APP_NAME}:db", f"{APPLICATION_NAME}2:db"
     )
 
+    await ops_test.model.wait_for_idle(apps=[DATABASE_APP_NAME], status="active", timeout=1000)
+
 
 @markers.juju2
 @pytest.mark.skip(reason="Unstable")
diff --git a/tests/integration/test_pg_hba.py b/tests/integration/test_pg_hba.py
@@ -104,7 +104,7 @@ async def test_pg_hba(ops_test: OpsTest, charm):
             if connection:
                 connection.close()
 
-        sleep(60)
+        sleep(90)
 
         for unit in ops_test.model.applications[DATABASE_APP_NAME].units:
             try:

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ async def test_build_and_deploy(ops_test: OpsTest, charm) -> None:`
`50`	`50`	`),`
`51`	`51`	`)`
`52`	`52`
	`53`	`+ await ops_test.model.relate(DATABASE_APP_NAME, f"{APPLICATION_NAME}:database")`
`53`	`54`	`await ops_test.model.wait_for_idle(status="active", timeout=1500)`
`54`	`55`
`55`	`56`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ async def test_build_and_deploy(ops_test: OpsTest, charm) -> None:`
`52`	`52`	`),`
`53`	`53`	`)`
`54`	`54`
	`55`	`+ await ops_test.model.relate(DATABASE_APP_NAME, f"{APPLICATION_NAME}:database")`
`55`	`56`	`await ops_test.model.wait_for_idle(status="active", timeout=1500)`
`56`	`57`
`57`	`58`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ async def test_deploy_latest(ops_test: OpsTest) -> None:`
`43`	`43`	`num_units=1,`
`44`	`44`	`channel="latest/edge",`
`45`	`45`	`)`
	`46`	`+ await ops_test.model.relate(DATABASE_APP_NAME, f"{APPLICATION_NAME}:database")`
`46`	`47`	`logger.info("Wait for applications to become active")`
`47`	`48`	`async with ops_test.fast_forward():`
`48`	`49`	`await ops_test.model.wait_for_idle(`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ async def test_deploy_stable(ops_test: OpsTest) -> None:`
`67`	`67`	`num_units=1,`
`68`	`68`	`channel="latest/edge",`
`69`	`69`	`)`
	`70`	`+ await ops_test.model.relate(DATABASE_APP_NAME, f"{APPLICATION_NAME}:database")`
`70`	`71`	`logger.info("Wait for applications to become active")`
`71`	`72`	`async with ops_test.fast_forward():`
`72`	`73`	`await ops_test.model.wait_for_idle(`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,9 @@ async def test_deploy_charms(ops_test: OpsTest, charm):`
`77`	`77`	`),`
`78`	`78`	`)`
`79`	`79`
`80`		`- await ops_test.model.wait_for_idle(apps=APP_NAMES, status="active", timeout=3000)`
	`80`	`+ await ops_test.model.wait_for_idle(`
	`81`	`+ apps=[DATABASE_APP_NAME, ANOTHER_DATABASE_APP_NAME], status="active", timeout=3000`
	`82`	`+ )`
`81`	`83`
`82`	`84`
`83`	`85`	`async def test_primary_read_only_endpoint_in_standalone_cluster(ops_test: OpsTest):`
`@@ -265,7 +267,6 @@ async def test_two_applications_doesnt_share_the_same_relation_data(ops_test: Op`
`265`	`267`	`channel="latest/edge",`
`266`	`268`	`base=CHARM_BASE,`
`267`	`269`	`)`
`268`		`- await ops_test.model.wait_for_idle(apps=all_app_names, status="active")`
`269`	`270`
`270`	`271`	`# Relate the new application with the database`
`271`	`272`	`# and wait for them exchanging some connection data.`