Apply Carl suggestions

Author: sinclert-canonical

tests/integration/integration/high_availability/high_availability_helpers_new.py renamed to tests/integration/helpers_ha.py

@@ -20,7 +20,7 @@
 
 from constants import SERVER_CONFIG_USERNAME
 
-from ...helpers import execute_queries_on_unit
+from .helpers import execute_queries_on_unit
 
 MINUTE_SECS = 60
 TEST_DATABASE_NAME = "testing"

tests/integration/integration/high_availability/conftest.py

@@ -8,14 +8,14 @@
 from jubilant_backports import Juju
 from pytest_operator.plugin import OpsTest
 
+from ...helpers_ha import (
+    get_app_leader,
+)
 from .high_availability_helpers import (
     deploy_and_scale_application,
     deploy_and_scale_mysql,
     relate_mysql_and_application,
 )
-from .high_availability_helpers_new import (
-    get_app_leader,
-)
 
 MYSQL_TEST_APP_NAME = "mysql-test-app"
 

tests/integration/integration/high_availability/test_async_replication.py

@@ -11,14 +11,14 @@
 from jubilant_backports import Juju
 
 from ... import architecture
-from ...markers import juju3
-from .high_availability_helpers_new import (
+from ...helpers_ha import (
     get_app_leader,
     get_app_units,
     get_mysql_cluster_status,
     get_mysql_max_written_value,
     wait_for_apps_status,
 )
+from ...markers import juju3
 
 MYSQL_APP_1 = "db1"
 MYSQL_APP_2 = "db2"

tests/integration/integration/high_availability/test_async_replication_upgrade.py

@@ -11,8 +11,7 @@
 from jubilant_backports import Juju
 
 from ... import architecture
-from ...markers import juju3
-from .high_availability_helpers_new import (
+from ...helpers_ha import (
     check_mysql_units_writes_increment,
     get_app_leader,
     get_app_units,
@@ -21,6 +20,7 @@
     get_mysql_variable_value,
     wait_for_apps_status,
 )
+from ...markers import juju3
 
 MYSQL_APP_1 = "db1"
 MYSQL_APP_2 = "db2"

tests/integration/integration/high_availability/test_primary_switchover.py

@@ -7,7 +7,7 @@
 import pytest
 from jubilant_backports import Juju, all_active
 
-from .high_availability_helpers_new import (
+from ...helpers_ha import (
     get_app_name,
     get_app_units,
     get_mysql_primary_unit,

tests/integration/integration/high_availability/test_replication_data_consistency.py

@@ -8,7 +8,7 @@
 from jubilant_backports import Juju
 
 from ...helpers import generate_random_string
-from .high_availability_helpers_new import (
+from ...helpers_ha import (
     check_mysql_units_writes_increment,
     insert_mysql_test_data,
     remove_mysql_test_data,

tests/integration/integration/high_availability/test_replication_data_isolation.py

@@ -7,7 +7,7 @@
 import pytest
 from jubilant_backports import Juju
 
-from .high_availability_helpers_new import (
+from ...helpers_ha import (
     insert_mysql_test_data,
     remove_mysql_test_data,
     verify_mysql_test_data,

tests/integration/integration/high_availability/test_replication_logs_rotation.py

@@ -16,7 +16,7 @@
 
 from constants import CHARMED_MYSQL_COMMON_DIRECTORY
 
-from .high_availability_helpers_new import (
+from ...helpers_ha import (
     get_app_leader,
     get_unit_process_id,
     wait_for_apps_status,

tests/integration/integration/high_availability/test_replication_reelection.py

@@ -8,7 +8,7 @@
 from jubilant_backports import Juju
 
 from ...helpers import generate_random_string
-from .high_availability_helpers_new import (
+from ...helpers_ha import (
     check_mysql_instances_online,
     check_mysql_units_writes_increment,
     get_mysql_primary_unit,

tests/integration/integration/high_availability/test_replication_scaling.py

@@ -8,7 +8,7 @@
 from jubilant_backports import Juju
 
 from ...helpers import generate_random_string
-from .high_availability_helpers_new import (
+from ...helpers_ha import (
     get_app_units,
     insert_mysql_test_data,
     remove_mysql_test_data,