integration: completely remove LocalHarness.

Signed-off-by: Nashwan Azhari <[email protected]>
canonical · Dec 17, 2024 · 9691673 · 9691673
1 parent 737e64f
commit 9691673
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 101 deletions.
diff --git a/tests/integration/README.md b/tests/integration/README.md
@@ -2,7 +2,7 @@
 
 ## Overview
 
-End to end tests are written in Python. They are built on top of a [Harness](./tests/conftest.py) fixture so that they can run on multiple environments like LXD, Multipass, Juju, or the local machine.
+End to end tests are written in Python. They are built on top of a [Harness](./tests/conftest.py) fixture so that they can run on multiple environments like LXD, Multipass, or Juju.
 
 End to end tests can be configured using environment variables. You can see all available options in [./tests/config.py](./tests/config.py).
 
@@ -28,17 +28,6 @@ In general, all end to end tests will require specifying the local path to the s
 
 End to end tests are typically run with: `cd tests/integration && tox -e integration`
 
-### Running end to end tests on the local machine
-
-```bash
-export TEST_SNAP=$PWD/k8s.snap
-export TEST_SUBSTRATE=local
-
-cd tests/integration && tox -e integration
-```
-
-> *NOTE*: When running locally, end to end tests that create more than one instance will fail.
-
 ### Running end to end tests on LXD containers
 
 First, make sure that you have initialized LXD:

diff --git a/tests/integration/tests/conftest.py b/tests/integration/tests/conftest.py
@@ -81,9 +81,7 @@ def _generate_inspection_report(h: harness.Harness, instance_id: str):
 @pytest.fixture(scope="session")
 def h() -> harness.Harness:
     LOG.debug("Create harness for %s", config.SUBSTRATE)
-    if config.SUBSTRATE == "local":
-        h = harness.LocalHarness()
-    elif config.SUBSTRATE == "lxd":
+    if config.SUBSTRATE == "lxd":
         h = harness.LXDHarness()
     elif config.SUBSTRATE == "multipass":
         h = harness.MultipassHarness()

diff --git a/tests/integration/tests/test_util/config.py b/tests/integration/tests/test_util/config.py
@@ -44,8 +44,8 @@
 SNAP_NAME = os.getenv("TEST_SNAP_NAME") or "k8s"
 
 # SUBSTRATE is the substrate to use for running the integration tests.
-# One of 'local' (default), 'lxd', 'juju', or 'multipass'.
-SUBSTRATE = os.getenv("TEST_SUBSTRATE") or "local"
+# One of 'lxd' (default), 'juju', or 'multipass'.
+SUBSTRATE = os.getenv("TEST_SUBSTRATE") or "lxd"
 
 # SKIP_CLEANUP can be used to prevent machines to be automatically destroyed
 # after the tests complete.

diff --git a/tests/integration/tests/test_util/harness/__init__.py b/tests/integration/tests/test_util/harness/__init__.py
@@ -3,7 +3,6 @@
 #
 from test_util.harness.base import Harness, HarnessError, Instance
 from test_util.harness.juju import JujuHarness
-from test_util.harness.local import LocalHarness
 from test_util.harness.lxd import LXDHarness
 from test_util.harness.multipass import MultipassHarness
 
@@ -12,7 +11,6 @@
     Harness,
     Instance,
     JujuHarness,
-    LocalHarness,
     LXDHarness,
     MultipassHarness,
 ]
diff --git a/tests/integration/tests/test_util/harness/base.py b/tests/integration/tests/test_util/harness/base.py
@@ -43,8 +43,7 @@ def __str__(self) -> str:
 
 class Harness:
     """Abstract how integration tests can start and manage multiple machines. This allows
-    writing integration tests that can run on the local machine, LXD, or Multipass with minimum
-    effort.
+    writing integration tests that can run on LXD, or Multipass with minimum effort.
     """
 
     name: str

diff --git a/tests/integration/tests/test_util/harness/local.py b/tests/integration/tests/test_util/harness/local.py