Skip data integrator tests on focal

Author: shayancanonical

tests/integration/markers.py

@@ -0,0 +1,10 @@
+# Copyright 2024 Canonical Ltd.
+# See LICENSE file for licensing details.
+
+import pytest
+
+from . import juju_
+
+only_with_juju_secrets = pytest.mark.skipif(
+    not juju_.has_secrets, reason="Requires juju version w/secrets"
+)

tests/integration/test_data_integrator.py

@@ -9,8 +9,9 @@
 import pytest
 from pytest_operator.plugin import OpsTest
 
-from . import juju_
 from .helpers import execute_queries_against_unit, get_tls_certificate_issuer
+from . import juju_
+from . import markers
 
 logger = logging.getLogger(__name__)
 
@@ -41,6 +42,7 @@ async def get_data_integrator_credentials(ops_test: OpsTest) -> typing.Dict:
 
 @pytest.mark.group(1)
 @pytest.mark.abort_on_fail
+@markers.only_with_juju_secrets
 async def test_external_connectivity_with_data_integrator(
     ops_test: OpsTest, mysql_router_charm_series: str
 ) -> None:
@@ -103,6 +105,7 @@ async def test_external_connectivity_with_data_integrator(
 
 @pytest.mark.group(1)
 @pytest.mark.abort_on_fail
+@markers.only_with_juju_secrets
 async def test_external_connectivity_with_data_integrator_and_tls(ops_test: OpsTest) -> None:
     """Test data integrator along with TLS operator"""
     logger.info("Ensuring no data exists in the test database")

tests/integration/test_exporter.py

@@ -178,7 +178,7 @@ async def test_exporter_endpoint_with_tls(ops_test: OpsTest) -> None:
 
     await ops_test.model.wait_for_idle([TLS_APP_NAME], status="active", timeout=SLOW_TIMEOUT)
 
-    logger.info(f"Relation mysqlrouter with {TLS_APP_NAME}")
+    logger.info(f"Relating mysqlrouter with {TLS_APP_NAME}")
 
     await ops_test.model.relate(
         f"{MYSQL_ROUTER_APP_NAME}:certificates", f"{TLS_APP_NAME}:certificates"