get rid of pytest-operator and libjuju

Author: imanenami

poetry.lock

@@ -91,9 +91,7 @@ optional = true
 
 [tool.poetry.group.integration.dependencies]
 pytest = ">=7.2"
-juju = "^3.6.0.0"
 coverage = { extras = ["toml"], version = ">7.0" }
-pytest-operator = ">0.20"
 kazoo = ">=2.8"
 tenacity = ">=7.0"
 pure-sasl = ">=0.5"

pyproject.toml

@@ -9,9 +9,8 @@
 
 import jubilant
 import pytest
-from pytest_operator.plugin import OpsTest
 
-from integration.helpers.pytest_operator import APP_NAME, CONTROLLER_NAME, KRaftMode
+from integration.helpers import APP_NAME, CONTROLLER_NAME, KRaftMode
 
 
 def pytest_addoption(parser):
@@ -21,16 +20,50 @@ def pytest_addoption(parser):
     )
 
 
-# TODO: this a temp solution until we migrate to DP workflows for int. testing
-def pytest_configure(config):
-    if os.environ.get("CI") == "true":
-        # Running in GitHub Actions; skip build step
-        plugin = config.pluginmanager.get_plugin("pytest-operator")
-        plugin.OpsTest.build_charm = _build_charm
+def _find_charm(charm_path: typing.Union[str, os.PathLike]) -> pathlib.Path:
+    charm_path = pathlib.Path(charm_path)
+    architecture = subprocess.run(
+        ["dpkg", "--print-architecture"],
+        capture_output=True,
+        check=True,
+        encoding="utf-8",
+    ).stdout.strip()
+    assert architecture in ("amd64", "arm64")
+    packed_charms = list(charm_path.glob(f"*{architecture}.charm"))
+    if len(packed_charms) == 1:
+        # python-libjuju's model.deploy(), juju deploy, and juju bundle files expect local charms
+        # to begin with `./` or `/` to distinguish them from Charmhub charms.
+        # Therefore, we need to return an absolute path—a relative `pathlib.Path` does not start
+        # with `./` when cast to a str.
+        # (python-libjuju model.deploy() expects a str but will cast any input to a str as a
+        # workaround for pytest-operator's non-compliant `build_charm` return type of
+        # `pathlib.Path`.)
+        return packed_charms[0].resolve(strict=True)
+    elif len(packed_charms) > 1:
+        raise ValueError(
+            f"More than one matching .charm file found at {charm_path=} for {architecture=}."
+        )
+    else:
+        raise FileNotFoundError(f"Unable to find .charm file for {architecture=} at {charm_path=}")
+
+
+def _build_charm(path: str) -> None:
+    if os.environ.get("CI"):
+        return
 
-        # Remove charmcraft dependency from `ops_test` fixture
-        check_deps = plugin.check_deps
-        plugin.check_deps = lambda *deps: check_deps(*(dep for dep in deps if dep != "charmcraft"))
+    # try:
+    #     _find_charm(path)
+    # except FileNotFoundError:
+    #     pass
+
+    # Build locally
+    cwd = os.getcwd()
+    os.chdir(path)
+    failed = os.system("charmcraft pack -v")
+    os.chdir(cwd)
+
+    if failed:
+        raise RuntimeError("Charm build failed")
 
 
 @pytest.fixture(scope="module")
@@ -65,51 +98,19 @@ def usernames():
 
 
 @pytest.fixture(scope="module")
-async def kafka_charm(ops_test: OpsTest):
+def kafka_charm():
     """Kafka charm used for integration testing."""
-    charm = await ops_test.build_charm(".")
-    return charm
+    charm_path = "."
+    _build_charm(charm_path)
+    return _find_charm(charm_path)
 
 
 @pytest.fixture(scope="module")
-async def app_charm(ops_test: OpsTest):
+def app_charm():
     """Build the application charm."""
     charm_path = "tests/integration/app-charm"
-    charm = await ops_test.build_charm(charm_path)
-    return charm
-
-
-async def _build_charm(self, charm_path: typing.Union[str, os.PathLike]) -> pathlib.Path:
-    charm_path = pathlib.Path(charm_path)
-    architecture = subprocess.run(
-        ["dpkg", "--print-architecture"],
-        capture_output=True,
-        check=True,
-        encoding="utf-8",
-    ).stdout.strip()
-    assert architecture in ("amd64", "arm64")
-    packed_charms = list(charm_path.glob(f"*{architecture}.charm"))
-    if len(packed_charms) == 1:
-        # python-libjuju's model.deploy(), juju deploy, and juju bundle files expect local charms
-        # to begin with `./` or `/` to distinguish them from Charmhub charms.
-        # Therefore, we need to return an absolute path—a relative `pathlib.Path` does not start
-        # with `./` when cast to a str.
-        # (python-libjuju model.deploy() expects a str but will cast any input to a str as a
-        # workaround for pytest-operator's non-compliant `build_charm` return type of
-        # `pathlib.Path`.)
-        return packed_charms[0].resolve(strict=True)
-    elif len(packed_charms) > 1:
-        raise ValueError(
-            f"More than one matching .charm file found at {charm_path=} for {architecture=} and "
-            f"Ubuntu 22.04: {packed_charms}."
-        )
-    else:
-        raise ValueError(
-            f"Unable to find .charm file for {architecture=} and Ubuntu 22.04 at {charm_path=}"
-        )
-
-
-# -- Jubilant --
+    _build_charm(charm_path)
+    return _find_charm(charm_path)
 
 
 @pytest.fixture(scope="module")

tests/integration/conftest.py

@@ -11,6 +11,9 @@
 import pytest
 
 from integration.ha.continuous_writes import ContinuousWrites
+from integration.helpers import (
+    APP_NAME,
+)
 from integration.helpers.ha import (
     RESTART_DELAY,
     assert_all_brokers_up,
@@ -20,9 +23,6 @@
     remove_restart_delay,
     reset_kafka_service,
 )
-from integration.helpers.pytest_operator import (
-    APP_NAME,
-)
 
 logger = logging.getLogger(__name__)
 

tests/integration/ha/conftest.py

@@ -13,8 +13,13 @@
 
 from integration.ha.continuous_writes import ContinuousWritesResult
 from integration.helpers import APP_NAME, CONTROLLER_NAME, KRaftMode
-from integration.helpers.jubilant import KRaftUnitStatus, all_active_idle, kraft_quorum_status
-from integration.helpers.pytest_operator import check_socket, get_unit_ipv4_address
+from integration.helpers.jubilant import (
+    KRaftUnitStatus,
+    all_active_idle,
+    check_socket,
+    get_unit_ipv4_address,
+    kraft_quorum_status,
+)
 from literals import KRAFT_NODE_ID_OFFSET, PATHS, SECURITY_PROTOCOL_PORTS
 
 CONTROLLER_PORT = SECURITY_PROTOCOL_PORTS["SASL_SSL", "SCRAM-SHA-512"].controller