Test

Author: sinclert-canonical

src/mysql_vm_helpers.py

@@ -11,6 +11,7 @@
 import shutil
 import subprocess
 import tempfile
+import time
 import typing
 from collections.abc import Iterable
 from typing import Any
@@ -195,13 +196,6 @@ def install_and_configure_mysql_dependencies() -> None:
                     ["/snap/bin/charmed-mysql.mysqlsh", "--help"], stderr=subprocess.PIPE
                 )
 
-            # fix ownership necessary for upgrades from 8/stable@r151
-            # TODO: remove once snap post-refresh fixes the permission
-            if common_path.owner() != MYSQL_SYSTEM_USER:
-                logger.debug("Updating charmed-mysql common directory ownership")
-                # Parameters are generated by the charm
-                os.system(f"chown -R {MYSQL_SYSTEM_USER} {CHARMED_MYSQL_COMMON_DIRECTORY}")  # noqa: S605
-
             for alias in [
                 "mysql",
                 "mysqlrouter",
@@ -433,9 +427,9 @@ def wait_until_mysql_connection(self, check_port: bool = True) -> None:
         Retry every 5 seconds for 120 seconds if there is an issue obtaining a connection.
         """
         logger.debug("Waiting for MySQL connection")
-
-        if not os.path.exists(MYSQLD_SOCK_FILE):
-            raise MySQLServiceNotRunningError("MySQL socket file not found")
+        time.sleep(60)
+        # if not os.path.exists(MYSQLD_SOCK_FILE):
+        #     raise MySQLServiceNotRunningError("MySQL socket file not found")
 
         if check_port and not self.check_mysqlcli_connection():
             raise MySQLServiceNotRunningError("Connection with mysqlcli not possible")

tests/integration/high_availability/test_upgrade_rollback_incompat.py

@@ -159,13 +159,11 @@ async def test_rollback(juju: Juju, charm: str, continuous_writes) -> None:
     mysql_leader = get_app_leader(juju, MYSQL_APP_NAME)
     local_charm = get_locally_built_charm(charm)
 
-    time.sleep(10)
-
     logging.info("Run pre-upgrade-check action")
     task = juju.run(unit=mysql_leader, action="pre-upgrade-check")
     task.raise_on_failure()
 
-    time.sleep(20)
+    time.sleep(60)
 
     logging.info("Refresh with previous charm")
     juju.refresh(app=MYSQL_APP_NAME, path=local_charm)