fix test_synapse_with_mjolnir_from_refresh_is_up

canonical · Dec 10, 2024 · 758ef49 · 758ef49
1 parent e93a4d5
commit 758ef49
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -149,8 +149,7 @@ async def synapse_charmhub_app_fixture(
             status=ACTIVE_STATUS_NAME,
             idle_period=5,
         )
-        # This line will be uncommented once PR#612 is merged
-        # await model.relate(f"{synapse_app_charmhub_name}:mas-database", f"{postgresql_app_name}")
+        await model.relate(f"{synapse_app_charmhub_name}:mas-database", f"{postgresql_app_name}")
         await model.relate(f"{synapse_app_charmhub_name}:database", f"{postgresql_app_name}")
         await model.wait_for_idle(idle_period=5)
     return app

diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py
@@ -441,11 +441,6 @@ async def test_synapse_with_mjolnir_from_refresh_is_up(
     }
     await synapse_charmhub_app.refresh(path=f"./{synapse_charm}", resources=resources)
     async with ops_test.fast_forward():
-        # Relate the refreshed charm to postgresql-k8s as required by MAS.
-        # This will be removed once PR#612 is merged
-        await model.integrate(
-            f"{synapse_charmhub_app.name}:mas-database", f"{postgresql_app.name}:database"
-        )
         await synapse_charmhub_app.model.wait_for_idle(
             idle_period=30, apps=[synapse_charmhub_app.name], status="active"
         )