Switch to relative imports

canonical · Nov 1, 2023 · fc2caa5 · fc2caa5
1 parent eaa88eb
commit fc2caa5
Show file tree

Hide file tree

Showing 19 changed files with 28 additions and 27 deletions.
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
diff --git a/tests/integration/ha_tests/__init__.py b/tests/integration/ha_tests/__init__.py
diff --git a/tests/integration/ha_tests/conftest.py b/tests/integration/ha_tests/conftest.py
@@ -7,7 +7,7 @@
 from pytest_operator.plugin import OpsTest
 from tenacity import Retrying, stop_after_delay, wait_fixed
 
-from tests.integration.ha_tests.helpers import (
+from .helpers import (
     APPLICATION_NAME,
     ORIGINAL_RESTART_CONDITION,
     RESTART_CONDITION,
@@ -18,7 +18,7 @@
     get_postgresql_parameter,
     update_restart_condition,
 )
-from tests.integration.helpers import run_command_on_unit
+from ..helpers import run_command_on_unit
 
 
 @pytest.fixture()

diff --git a/tests/integration/ha_tests/helpers.py b/tests/integration/ha_tests/helpers.py
@@ -20,7 +20,7 @@
     wait_fixed,
 )
 
-from tests.integration.helpers import db_connect, get_unit_address, run_command_on_unit
+from ..helpers import db_connect, get_unit_address, run_command_on_unit
 
 APPLICATION_NAME = "postgresql-test-app"
 METADATA = yaml.safe_load(Path("./metadata.yaml").read_text())

diff --git a/tests/integration/ha_tests/test_replication.py b/tests/integration/ha_tests/test_replication.py
@@ -6,7 +6,7 @@
 from pytest_operator.plugin import OpsTest
 from tenacity import Retrying, stop_after_delay, wait_fixed
 
-from tests.integration.ha_tests.helpers import (
+from .helpers import (
     APPLICATION_NAME,
     app_name,
     are_writes_increasing,
@@ -16,7 +16,7 @@
     get_primary,
     start_continuous_writes,
 )
-from tests.integration.helpers import CHARM_SERIES, db_connect, scale_application
+from ..helpers import CHARM_SERIES, db_connect, scale_application
 
 
 @pytest.mark.group(1)

diff --git a/tests/integration/ha_tests/test_restore_cluster.py b/tests/integration/ha_tests/test_restore_cluster.py
@@ -6,13 +6,13 @@
 import pytest
 from pytest_operator.plugin import OpsTest
 
-from tests.integration.ha_tests.helpers import (
+from .helpers import (
     add_unit_with_storage,
     get_patroni_cluster,
     reused_full_cluster_recovery_storage,
     storage_id,
 )
-from tests.integration.helpers import (
+from ..helpers import (
     CHARM_SERIES,
     db_connect,
     get_password,

diff --git a/tests/integration/ha_tests/test_self_healing.py b/tests/integration/ha_tests/test_self_healing.py
@@ -8,8 +8,8 @@
 from pytest_operator.plugin import OpsTest
 from tenacity import Retrying, stop_after_delay, wait_fixed
 
-from tests.integration.ha_tests.conftest import APPLICATION_NAME
-from tests.integration.ha_tests.helpers import (
+from .conftest import APPLICATION_NAME
+from .helpers import (
     METADATA,
     ORIGINAL_RESTART_CONDITION,
     add_unit_with_storage,
@@ -43,7 +43,7 @@
     update_restart_condition,
     wait_network_restore,
 )
-from tests.integration.helpers import (
+from ..helpers import (
     CHARM_SERIES,
     db_connect,
     get_machine_from_unit,

diff --git a/tests/integration/ha_tests/test_upgrade.py b/tests/integration/ha_tests/test_upgrade.py
@@ -11,19 +11,19 @@
 import pytest
 from pytest_operator.plugin import OpsTest
 
-from tests.integration.ha_tests.helpers import (
+from .helpers import (
     APPLICATION_NAME,
     are_writes_increasing,
     check_writes,
     start_continuous_writes,
 )
-from tests.integration.helpers import (
+from ..helpers import (
     DATABASE_APP_NAME,
     count_switchovers,
     get_leader_unit,
     get_primary,
 )
-from tests.integration.new_relations.helpers import get_application_relation_data
+from ..new_relations.helpers import get_application_relation_data
 
 logger = logging.getLogger(__name__)
 

diff --git a/tests/integration/ha_tests/test_upgrade_from_stable.py b/tests/integration/ha_tests/test_upgrade_from_stable.py
@@ -6,13 +6,13 @@
 import pytest
 from pytest_operator.plugin import OpsTest
 
-from tests.integration.ha_tests.helpers import (
+from .helpers import (
     APPLICATION_NAME,
     are_writes_increasing,
     check_writes,
     start_continuous_writes,
 )
-from tests.integration.helpers import (
+from ..helpers import (
     DATABASE_APP_NAME,
     count_switchovers,
     get_leader_unit,

diff --git a/tests/integration/helpers.py b/tests/integration/helpers.py
@@ -33,6 +33,7 @@
 CHARM_SERIES = "jammy"
 METADATA = yaml.safe_load(Path("./metadata.yaml").read_text())
 DATABASE_APP_NAME = METADATA["name"]
+STORAGE_PATH = METADATA["storage"]["pgdata"]["location"]
 
 
 async def build_connection_string(

diff --git a/tests/integration/new_relations/__init__.py b/tests/integration/new_relations/__init__.py
diff --git a/tests/integration/new_relations/test_new_relations.py b/tests/integration/new_relations/test_new_relations.py
@@ -12,8 +12,8 @@
 import yaml
 from pytest_operator.plugin import OpsTest
 
-from tests.integration.helpers import CHARM_SERIES, scale_application
-from tests.integration.new_relations.helpers import (
+from ..helpers import CHARM_SERIES, scale_application
+from .helpers import (
     build_connection_string,
     check_relation_data_existence,
     get_application_relation_data,

diff --git a/tests/integration/test_backups.py b/tests/integration/test_backups.py
@@ -10,7 +10,7 @@
 from pytest_operator.plugin import OpsTest
 from tenacity import Retrying, stop_after_attempt, wait_exponential
 
-from tests.integration.helpers import (
+from .helpers import (
     CHARM_SERIES,
     DATABASE_APP_NAME,
     construct_endpoint,

diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py
@@ -12,10 +12,10 @@
 from pytest_operator.plugin import OpsTest
 from tenacity import Retrying, stop_after_attempt, wait_exponential
 
-from tests.helpers import STORAGE_PATH
-from tests.integration.helpers import (
+from .helpers import (
     CHARM_SERIES,
     DATABASE_APP_NAME,
+    STORAGE_PATH,
     check_cluster_members,
     convert_records_to_dict,
     db_connect,

diff --git a/tests/integration/test_db.py b/tests/integration/test_db.py
@@ -11,7 +11,7 @@
 from pytest_operator.plugin import OpsTest
 from tenacity import Retrying, stop_after_delay, wait_fixed
 
-from tests.integration.helpers import (
+from .helpers import (
     CHARM_SERIES,
     DATABASE_APP_NAME,
     build_connection_string,

diff --git a/tests/integration/test_db_admin.py b/tests/integration/test_db_admin.py
@@ -8,7 +8,7 @@
 from landscape_api.base import HTTPError, run_query
 from pytest_operator.plugin import OpsTest
 
-from tests.integration.helpers import (
+from .helpers import (
     CHARM_SERIES,
     DATABASE_APP_NAME,
     check_database_users_existence,

diff --git a/tests/integration/test_password_rotation.py b/tests/integration/test_password_rotation.py
@@ -6,9 +6,9 @@
 import pytest
 from pytest_operator.plugin import OpsTest
 
-from tests.helpers import METADATA
-from tests.integration.helpers import (
+from .helpers import (
     CHARM_SERIES,
+    METADATA,
     check_patroni,
     get_password,
     restart_patroni,

diff --git a/tests/integration/test_plugins.py b/tests/integration/test_plugins.py
@@ -7,7 +7,7 @@
 import pytest as pytest
 from pytest_operator.plugin import OpsTest
 
-from tests.integration.helpers import (
+from .helpers import (
     CHARM_SERIES,
     DATABASE_APP_NAME,
     db_connect,

diff --git a/tests/integration/test_tls.py b/tests/integration/test_tls.py
@@ -8,9 +8,9 @@
 from pytest_operator.plugin import OpsTest
 from tenacity import Retrying, stop_after_attempt, stop_after_delay, wait_exponential
 
-from tests.helpers import METADATA
-from tests.integration.helpers import (
+from .helpers import (
     CHARM_SERIES,
+    METADATA,
     DATABASE_APP_NAME,
     change_primary_start_timeout,
     check_tls,