Miscellaneous integration test improvements

Author: shayancanonical

tests/integration/juju_.py

@@ -6,4 +6,4 @@
 # libjuju version != juju agent version, but the major version should be identical—which is good
 # enough to check for secrets
 _libjuju_version = importlib.metadata.version("juju")
-has_secrets = int(_libjuju_version.split(".")[0]) >= 3
+is_3_or_higher = int(_libjuju_version.split(".")[0]) >= 3

tests/integration/test_data_integrator.py

@@ -21,7 +21,7 @@
 TEST_DATABASE = "testdatabase"
 TEST_TABLE = "testtable"
 
-if juju_.has_secrets:
+if juju_.is_3_or_higher:
     TLS_APP_NAME = "self-signed-certificates"
     TLS_CONFIG = {"ca-common-name": "Test CA"}
 else:
@@ -34,7 +34,7 @@ async def get_data_integrator_credentials(ops_test: OpsTest) -> typing.Dict:
     data_integrator_unit = ops_test.model.applications[DATA_INTEGRATOR_APP_NAME].units[0]
     action = await data_integrator_unit.run_action(action_name="get-credentials")
     result = await action.wait()
-    if juju_.has_secrets:
+    if juju_.is_3_or_higher:
         assert result.results["return-code"] == 0
     else:
         assert result.results["Code"] == "0"

tests/integration/test_exporter.py

@@ -20,7 +20,7 @@
 GRAFANA_AGENT_APP_NAME = "grafana-agent"
 SLOW_TIMEOUT = 25 * 60
 
-if juju_.has_secrets:
+if juju_.is_3_or_higher:
     TLS_APP_NAME = "self-signed-certificates"
     TLS_CONFIG = {"ca-common-name": "Test CA"}
 else:
@@ -184,6 +184,7 @@ async def test_exporter_endpoint_with_tls(ops_test: OpsTest) -> None:
         application_name=TLS_APP_NAME,
         channel="stable",
         config=TLS_CONFIG,
+        series="jammy",
     )
 
     await ops_test.model.wait_for_idle([TLS_APP_NAME], status="active", timeout=SLOW_TIMEOUT)

tests/integration/test_tls.py

@@ -3,9 +3,9 @@
 
 import asyncio
 import logging
-import time
 
 import pytest
+import tenacity
 from pytest_operator.plugin import OpsTest
 
 from . import juju_
@@ -18,7 +18,7 @@
 TEST_APP_NAME = "mysql-test-app"
 SLOW_TIMEOUT = 15 * 60
 
-if juju_.has_secrets:
+if juju_.is_3_or_higher:
     TLS_APP_NAME = "self-signed-certificates"
     TLS_CONFIG = {"ca-common-name": "Test CA"}
 else:
@@ -34,7 +34,11 @@ async def test_build_deploy_and_relate(ops_test: OpsTest, mysql_router_charm_ser
     async with ops_test.fast_forward():
         # deploy mysql first
         await ops_test.model.deploy(
-            MYSQL_APP_NAME, channel="8.0/edge", config={"profile": "testing"}, num_units=1
+            MYSQL_APP_NAME,
+            channel="8.0/edge",
+            application_name=MYSQL_APP_NAME,
+            config={"profile": "testing"},
+            num_units=1,
         )
 
         # ROUTER
@@ -49,7 +53,11 @@ async def test_build_deploy_and_relate(ops_test: OpsTest, mysql_router_charm_ser
                 series=mysql_router_charm_series,
             ),
             ops_test.model.deploy(
-                TLS_APP_NAME, application_name=TLS_APP_NAME, channel="stable", config=TLS_CONFIG
+                TLS_APP_NAME,
+                application_name=TLS_APP_NAME,
+                channel="stable",
+                config=TLS_CONFIG,
+                series="jammy",
             ),
             ops_test.model.deploy(
                 TEST_APP_NAME,
@@ -78,39 +86,56 @@ async def test_connected_encryption(ops_test: OpsTest) -> None:
     """Test encryption when backend database is using TLS."""
     mysqlrouter_unit = ops_test.model.applications[MYSQL_ROUTER_APP_NAME].units[0]
 
-    issuer = await get_tls_certificate_issuer(
-        ops_test,
-        mysqlrouter_unit.name,
-        socket="/var/snap/charmed-mysql/common/run/mysqlrouter/mysql.sock",
-    )
-    assert (
-        "Issuer: CN = MySQL_Router_Auto_Generated_CA_Certificate" in issuer
-    ), "Expected mysqlrouter autogenerated certificate"
+    for attempt in tenacity.Retrying(
+        reraise=True,
+        stop=tenacity.stop_after_delay(60),
+        wait=tenacity.wait_fixed(10),
+    ):
+        with attempt:
+            issuer = await get_tls_certificate_issuer(
+                ops_test,
+                mysqlrouter_unit.name,
+                socket="/var/snap/charmed-mysql/common/run/mysqlrouter/mysql.sock",
+            )
+            assert (
+                "Issuer: CN = MySQL_Router_Auto_Generated_CA_Certificate" in issuer
+            ), "Expected mysqlrouter autogenerated certificate"
 
     logger.info("Relating TLS with mysqlrouter")
     await ops_test.model.relate(TLS_APP_NAME, MYSQL_ROUTER_APP_NAME)
 
-    time.sleep(30)
-
     logger.info("Getting certificate issuer after relating with tls operator")
-    issuer = await get_tls_certificate_issuer(
-        ops_test,
-        mysqlrouter_unit.name,
-        socket="/var/snap/charmed-mysql/common/run/mysqlrouter/mysql.sock",
-    )
-    assert "CN = Test CA" in issuer, f"Expected mysqlrouter certificate from {TLS_APP_NAME}"
+    for attempt in tenacity.Retrying(
+        reraise=True,
+        stop=tenacity.stop_after_delay(60),
+        wait=tenacity.wait_fixed(10),
+    ):
+        with attempt:
+            issuer = await get_tls_certificate_issuer(
+                ops_test,
+                mysqlrouter_unit.name,
+                socket="/var/snap/charmed-mysql/common/run/mysqlrouter/mysql.sock",
+            )
+            assert (
+                "CN = Test CA" in issuer
+            ), f"Expected mysqlrouter certificate from {TLS_APP_NAME}"
 
     logger.info("Removing relation TLS with mysqlrouter")
     await ops_test.model.applications[MYSQL_ROUTER_APP_NAME].remove_relation(
         f"{TLS_APP_NAME}:certificates", f"{MYSQL_ROUTER_APP_NAME}:certificates"
     )
 
-    time.sleep(30)
-    issuer = await get_tls_certificate_issuer(
-        ops_test,
-        mysqlrouter_unit.name,
-        socket="/var/snap/charmed-mysql/common/run/mysqlrouter/mysql.sock",
-    )
-    assert (
-        "Issuer: CN = MySQL_Router_Auto_Generated_CA_Certificate" in issuer
-    ), "Expected mysqlrouter autogenerated CA certificate"
+    for attempt in tenacity.Retrying(
+        reraise=True,
+        stop=tenacity.stop_after_delay(60),
+        wait=tenacity.wait_fixed(10),
+    ):
+        with attempt:
+            issuer = await get_tls_certificate_issuer(
+                ops_test,
+                mysqlrouter_unit.name,
+                socket="/var/snap/charmed-mysql/common/run/mysqlrouter/mysql.sock",
+            )
+            assert (
+                "Issuer: CN = MySQL_Router_Auto_Generated_CA_Certificate" in issuer
+            ), "Expected mysqlrouter autogenerated CA certificate"