Fix 16/edge refresh tests (including refresh to the same snap revision) (#918)

* Update refresh tests to modify charm to ensure refresh off edge or stable

* Fix lint warnings

* Store temporary charms in /tmp for upgrade_from_stable tests

* Use force-refresh-start instead of forcing refresh by updating versions

* Handle same snap revision situation in upgrade tests

Signed-off-by: Marcelo Henrique Neppel <[email protected]>

---------

Signed-off-by: Marcelo Henrique Neppel <[email protected]>
Co-authored-by: Shayan Patel <[email protected]>

Author: marceloneppel

tests/integration/ha_tests/test_upgrade.py

@@ -2,7 +2,6 @@
 # See LICENSE file for licensing details.
 
 import logging
-import pathlib
 import platform
 import shutil
 import zipfile
@@ -40,7 +39,7 @@ async def test_deploy_latest(ops_test: OpsTest) -> None:
         "-n",
         3,
         "--channel",
-        "16/edge/test-refresh-v3-workload2",  # TODO remove branch
+        "16/edge",
         "--config",
         "profile=testing",
         "--base",
@@ -90,21 +89,44 @@ async def test_upgrade_from_edge(ops_test: OpsTest, continuous_writes, charm) ->
     await application.refresh(path=charm)
 
     logger.info("Wait for upgrade to start")
-    await ops_test.model.block_until(lambda: application.status == "blocked", timeout=TIMEOUT)
-
-    logger.info("Wait for first unit to upgrade")
-    async with ops_test.fast_forward("60s"):
-        await ops_test.model.wait_for_idle(
-            apps=[DATABASE_APP_NAME], idle_period=30, timeout=TIMEOUT
+    try:
+        # Blocked status is expected due to compatibility checks.
+        await ops_test.model.block_until(lambda: application.status == "blocked", timeout=60 * 3)
+
+        logger.info("Wait for refresh to block due to compatibility checks")
+        async with ops_test.fast_forward("60s"):
+            await ops_test.model.wait_for_idle(
+                apps=[DATABASE_APP_NAME], idle_period=30, timeout=TIMEOUT
+            )
+
+        assert "Refresh incompatible" in application.status_message, (
+            "Application refresh not blocked due to incompatibility"
         )
 
-    logger.info("Run resume-refresh action")
-    # Highest to lowest unit number
-    refresh_order = sorted(
-        application.units, key=lambda unit: int(unit.name.split("/")[1]), reverse=True
-    )
-    action = await refresh_order[1].run_action("resume-refresh")
-    await action.wait()
+        # Highest to lowest unit number
+        refresh_order = sorted(
+            application.units, key=lambda unit: int(unit.name.split("/")[1]), reverse=True
+        )
+        action = await refresh_order[0].run_action(
+            "force-refresh-start", **{"check-compatibility": False}
+        )
+        await action.wait()
+
+        logger.info("Wait for first unit to upgrade")
+        async with ops_test.fast_forward("60s"):
+            await ops_test.model.wait_for_idle(
+                apps=[DATABASE_APP_NAME], idle_period=30, timeout=TIMEOUT
+            )
+
+        logger.info("Run resume-refresh action")
+        action = await refresh_order[1].run_action("resume-refresh")
+        await action.wait()
+    except TimeoutError:
+        # If the application didn't get into the blocked state, it should have upgraded only
+        # the charm code because the snap revision didn't change.
+        assert application.status == "active", (
+            "Application didn't reach blocked or active state after refresh attempt"
+        )
 
     logger.info("Wait for upgrade to complete")
     async with ops_test.fast_forward("60s"):
@@ -147,7 +169,7 @@ async def test_fail_and_rollback(ops_test, charm, continuous_writes) -> None:
     await action.wait()
 
     filename = Path(charm).name
-    fault_charm = Path("/tmp/", filename)
+    fault_charm = Path("/tmp", f"{filename}.fault.charm")
     shutil.copy(charm, fault_charm)
 
     logger.info("Inject dependency fault")
@@ -194,7 +216,7 @@ async def test_fail_and_rollback(ops_test, charm, continuous_writes) -> None:
 
 async def inject_dependency_fault(charm_file: str | Path) -> None:
     """Inject a dependency fault into the PostgreSQL charm."""
-    with pathlib.Path("refresh_versions.toml").open("rb") as file:
+    with Path("refresh_versions.toml").open("rb") as file:
         versions = tomli.load(file)
 
     versions["charm"] = "16/0.0.0"

tests/integration/ha_tests/test_upgrade_from_stable.py

@@ -31,9 +31,9 @@ async def test_deploy_stable(ops_test: OpsTest) -> None:
         DATABASE_APP_NAME,
         "-n",
         3,
-        # TODO move to stable once we release refresh v3
+        # TODO move to stable once we release refresh v3 to stable
         "--channel",
-        "16/edge/test-refresh-v3-workload2",
+        "16/edge",
         "--base",
         "[email protected]",
     )
@@ -82,21 +82,44 @@ async def test_upgrade_from_stable(ops_test: OpsTest, charm):
     await application.refresh(path=charm)
 
     logger.info("Wait for upgrade to start")
-    await ops_test.model.block_until(lambda: application.status == "blocked", timeout=TIMEOUT)
-
-    logger.info("Wait for first unit to upgrade")
-    async with ops_test.fast_forward("60s"):
-        await ops_test.model.wait_for_idle(
-            apps=[DATABASE_APP_NAME], idle_period=30, timeout=TIMEOUT
+    try:
+        # Blocked status is expected due to compatibility checks.
+        await ops_test.model.block_until(lambda: application.status == "blocked", timeout=60 * 3)
+
+        logger.info("Wait for refresh to block due to compatibility checks")
+        async with ops_test.fast_forward("60s"):
+            await ops_test.model.wait_for_idle(
+                apps=[DATABASE_APP_NAME], idle_period=30, timeout=TIMEOUT
+            )
+
+        assert "Refresh incompatible" in application.status_message, (
+            "Application refresh not blocked due to incompatibility"
         )
 
-    logger.info("Run resume-refresh action")
-    # Highest to lowest unit number
-    refresh_order = sorted(
-        application.units, key=lambda unit: int(unit.name.split("/")[1]), reverse=True
-    )
-    action = await refresh_order[1].run_action("resume-refresh")
-    await action.wait()
+        # Highest to lowest unit number
+        refresh_order = sorted(
+            application.units, key=lambda unit: int(unit.name.split("/")[1]), reverse=True
+        )
+        action = await refresh_order[0].run_action(
+            "force-refresh-start", **{"check-compatibility": False}
+        )
+        await action.wait()
+
+        logger.info("Wait for first unit to upgrade")
+        async with ops_test.fast_forward("60s"):
+            await ops_test.model.wait_for_idle(
+                apps=[DATABASE_APP_NAME], idle_period=30, timeout=TIMEOUT
+            )
+
+        logger.info("Run resume-refresh action")
+        action = await refresh_order[1].run_action("resume-refresh")
+        await action.wait()
+    except TimeoutError:
+        # If the application didn't get into the blocked state, it should have upgraded only
+        # the charm code because the snap revision didn't change.
+        assert application.status == "active", (
+            "Application didn't reach blocked or active state after refresh attempt"
+        )
 
     logger.info("Wait for upgrade to complete")
     async with ops_test.fast_forward("60s"):