diff --git a/tests/integration/backup_tests/helpers.py b/tests/integration/backup_tests/helpers.py index 071112c88..7ffcc4edd 100644 --- a/tests/integration/backup_tests/helpers.py +++ b/tests/integration/backup_tests/helpers.py @@ -8,9 +8,8 @@ from pytest_operator.plugin import OpsTest from tenacity import RetryError, Retrying, stop_after_attempt, wait_fixed -from ..helpers import get_app_name - from ..ha_tests import helpers as ha_helpers +from ..helpers import get_app_name S3_APP_NAME = "s3-integrator" TIMEOUT = 10 * 60 diff --git a/tests/integration/backup_tests/test_backups.py b/tests/integration/backup_tests/test_backups.py index 6bf165eff..d74144829 100644 --- a/tests/integration/backup_tests/test_backups.py +++ b/tests/integration/backup_tests/test_backups.py @@ -2,6 +2,7 @@ # Copyright 2023 Canonical Ltd. # See LICENSE file for licensing details. import asyncio +import logging import secrets import string import time @@ -19,9 +20,11 @@ TIMEOUT = 15 * 60 ENDPOINT = "s3-credentials" NEW_CLUSTER = "new-mongodb" -import logging + + logger = logging.getLogger(__name__) + @pytest.fixture() async def continuous_writes_to_db(ops_test: OpsTest): """Continuously writes to DB for the duration of the test.""" @@ -84,6 +87,7 @@ async def test_blocked_incorrect_creds(ops_test: OpsTest) -> None: assert db_unit.workload_status_message == "s3 credentials are incorrect." + @pytest.mark.skip("skip") @pytest.mark.abort_on_fail async def test_blocked_incorrect_conf(ops_test: OpsTest) -> None: @@ -156,6 +160,7 @@ async def test_create_and_list_backups(ops_test: OpsTest) -> None: except RetryError: assert backups == 1, "Backup not created." + @pytest.mark.skip("skip") @pytest.mark.abort_on_fail async def test_multi_backup(ops_test: OpsTest, continuous_writes_to_db) -> None: