Fix integration tests

Author: sinclert-canonical

poetry.lock

@@ -58,6 +58,8 @@ mysql-connector-python = "~8.0.33"
 tenacity = "^9.0.0"
 ops = "^2.9.0"
 allure-pytest-default-results = "^0.1.2"
+tomli = "^2.2.1"
+tomli-w = "^1.2.0"
 
 [tool.poetry.group.build-refresh-version]
 optional = true

pyproject.toml

@@ -5,18 +5,16 @@
 import logging
 import os
 import pathlib
-import platform
-import re
 import shutil
 import typing
 import zipfile
 
 import pytest
 import tenacity
+import tomli
+import tomli_w
 from pytest_operator.plugin import OpsTest
 
-import snap
-
 from .helpers import (
     APPLICATION_DEFAULT_APP_NAME,
     MYSQL_DEFAULT_APP_NAME,
@@ -107,8 +105,8 @@ async def test_upgrade_from_edge(ops_test: OpsTest, charm, continuous_writes) ->
         lambda: mysql_router_application.status == "blocked", timeout=TIMEOUT
     )
     assert (
-        "resume-upgrade" in mysql_router_application.status_message
-    ), "mysql router application status not indicating that user should resume upgrade"
+        "resume-refresh" in mysql_router_application.status_message
+    ), "mysql router application status not indicating that user should resume refresh"
 
     for attempt in tenacity.Retrying(
         reraise=True,
@@ -122,8 +120,8 @@ async def test_upgrade_from_edge(ops_test: OpsTest, charm, continuous_writes) ->
 
     mysql_router_leader_unit = await get_leader_unit(ops_test, MYSQL_ROUTER_APP_NAME)
 
-    logger.info("Running resume-upgrade on the mysql router leader unit")
-    await run_action(mysql_router_leader_unit, "resume-upgrade")
+    logger.info("Running resume-refresh on the mysql router leader unit")
+    await run_action(mysql_router_leader_unit, "resume-refresh")
 
     logger.info("Waiting for upgrade to complete on all units")
     await ops_test.model.wait_for_idle(
@@ -218,17 +216,11 @@ def create_valid_upgrade_charm(charm_file: typing.Union[str, pathlib.Path]) -> N
     with zipfile.ZipFile(charm_file, mode="a") as charm_zip:
         charm_zip.writestr("workload_version", f"{workload_version}+testupgrade\n")
 
-        # charm needs to refresh snap to be able to avoid no-op when upgrading.
-        # set an old revision of the snap
-        snap_file = pathlib.Path("src/snap.py")
-        content = snap_file.read_text()
-        old_revision = {"x86_64": "121", "aarch64": "122"}[platform.machine()]
-        new_snap_content = re.sub(
-            f'"{platform.machine()}": "{snap.revision}"',
-            f'"{platform.machine()}": "{old_revision}"',
-            str(content),
-        )
-        charm_zip.writestr("src/snap.py", new_snap_content)
+    with pathlib.Path("refresh_versions.toml").open("rb") as file:
+        versions = tomli.load(file)
+        versions["snap"]["revisions"]["x86_64"] = "121"
+        versions["snap"]["revisions"]["aarch64"] = "122"
+        charm_zip.writestr("refresh_versions.toml", tomli_w.dumps(versions))
 
 
 def create_invalid_upgrade_charm(charm_file: typing.Union[str, pathlib.Path]) -> None: