Remove LOCALHOST object from test infra

Author: rcmadhankumar

pytest_container/container.py

@@ -11,7 +11,6 @@
 import operator
 import os
 import socket
-import subprocess
 import sys
 import tempfile
 import time
@@ -1035,6 +1034,7 @@ def check_output(self, cmd: str, strip: bool = True) -> str:
             ],
         )[1]
 
+
 @dataclass
 class ContainerLauncher:
     """Helper context manager to setup, start and teardown a container including

pytest_container/runtime.py

@@ -21,7 +21,6 @@
 from typing import Optional
 from typing import Union
 
-
 from _pytest.mark.structures import ParameterSet
 from pytest import param
 

test-requirements.txt

@@ -3,4 +3,5 @@ pytest-xdist
 coverage
 pytest-rerunfailures
 typeguard
+ifaddr
 .

tests/test_container_build.py

@@ -13,8 +13,8 @@
 from pytest_container.container import ContainerData
 from pytest_container.container import ContainerLauncher
 from pytest_container.container import EntrypointSelection
+from pytest_container.helpers import run_command
 from pytest_container.inspect import PortForwarding
-from pytest_container.runtime import LOCALHOST
 from pytest_container.runtime import OciRuntimeBase
 
 from .images import LEAP
@@ -285,9 +285,9 @@ def test_multistage_build_target(
         extra_build_args=get_extra_build_args(pytestconfig),
     )
     assert (
-        LOCALHOST.check_output(
-            f"{container_runtime.runner_binary} run --rm {first_target}",
-        ).strip()
+        run_command(
+            [container_runtime.runner_binary, "run", "--rm", first_target]
+        )[1].strip()
         == "foobar"
     )
 
@@ -301,9 +301,15 @@ def test_multistage_build_target(
 
     assert first_target != second_target
     assert (
-        LOCALHOST.check_output(
-            f"{container_runtime.runner_binary} run --rm {second_target} /bin/test.sh",
-        ).strip()
+        run_command(
+            [
+                container_runtime.runner_binary,
+                "run",
+                "--rm",
+                second_target,
+                "/bin/test.sh",
+            ]
+        )[1].strip()
         == "foobar"
     )
 
@@ -313,10 +319,17 @@ def test_multistage_build_target(
     ):
         assert (
             distro
-            in LOCALHOST.check_output(
-                f"{container_runtime.runner_binary} run --rm --entrypoint= {target} "
-                "cat /etc/os-release",
-            ).strip()
+            in run_command(
+                [
+                    container_runtime.runner_binary,
+                    "run",
+                    "--rm",
+                    "--entrypoint=",
+                    target,
+                    "cat",
+                    "/etc/os-release",
+                ]
+            )[1].strip()
         )
 
 

tests/test_launcher.py

@@ -19,7 +19,7 @@
 from pytest_container.container import ContainerVolume
 from pytest_container.container import DerivedContainer
 from pytest_container.container import EntrypointSelection
-from pytest_container.runtime import LOCALHOST
+from pytest_container.helpers import run_command
 from pytest_container.runtime import OciRuntimeBase
 
 from .images import CMDLINE_APP_CONTAINER
@@ -101,9 +101,17 @@ def test_launcher_creates_and_cleanes_up_volumes(
                 assert vol.host_path and os.path.exists(vol.host_path)
             elif isinstance(vol, ContainerVolume):
                 assert vol.volume_id
-                assert LOCALHOST.run_expect(
-                    [0],
-                    f"{container_runtime.runner_binary} volume inspect {vol.volume_id}",
+                assert (
+                    run_command(
+                        [
+                            container_runtime.runner_binary,
+                            "volume",
+                            "inspect",
+                            vol.volume_id,
+                        ],
+                        ignore_errors=False,
+                    )[0]
+                    == 0
                 )
             else:
                 assert False, f"invalid volume type {type(vol)}"

tests/test_port_forwarding.py

@@ -2,21 +2,22 @@
 :py:attr:`~pytest_container.container.ContainerBase.forwarded_ports`."""
 
 # pylint: disable=missing-function-docstring
-import itertools
+import re
 import socket
 from typing import List
 
+import ifaddr
 import pytest
 
 from pytest_container.container import ContainerData
 from pytest_container.container import ContainerLauncher
 from pytest_container.container import DerivedContainer
 from pytest_container.container import PortForwarding
 from pytest_container.container import lock_host_port_search
+from pytest_container.helpers import run_command
 from pytest_container.inspect import NetworkProtocol
 from pytest_container.pod import Pod
 from pytest_container.pod import PodLauncher
-from pytest_container.runtime import LOCALHOST
 from pytest_container.runtime import OciRuntimeBase
 from pytest_container.runtime import Version
 
@@ -65,8 +66,12 @@ def _create_nginx_container(number: int) -> DerivedContainer:
 
 CONTAINER_IMAGES = [WEB_SERVER]
 
+curl_version_string = run_command(["curl", "--version"])[1]
+pattern = r"curl\s+(\d+(?:\.\d+)+)"
+match = re.search(pattern, curl_version_string)
+assert match is not None, "Curl version not found"
+_curl_version = Version.parse(match.group(1))
 
-_curl_version = Version.parse(LOCALHOST.package("curl").version)
 
 #: curl cli with additional retries as a single curl sometimes fails with docker
 #: with ``curl: (56) Recv failure: Connection reset by peer`` for reasons…
@@ -175,18 +180,18 @@ def test_multiple_open_ports(container: ContainerData, number: int, host):
     )
 
 
-_INTERFACES = [
-    name
-    for name in LOCALHOST.interface.names()
-    if name[:2] in ("en", "et", "wl")
-]
-_ADDRESSES = [
-    addr
-    for addr in itertools.chain.from_iterable(
-        LOCALHOST.interface(interface).addresses for interface in _INTERFACES
-    )
-    if not addr.startswith("169.254.") and not addr.startswith("fe80:")
-]
+def _find_all_usable_ips():
+    for adapter in ifaddr.get_adapters():
+        if not adapter.name.startswith(("en", "et", "wl")):
+            continue
+        for addr in adapter.ips:
+            if addr.is_IPv4 and not addr.ip.startswith("169.254."):
+                yield str(addr.ip)
+            elif addr.is_IPv6 and not addr.ip[0].startswith("fe80:"):
+                yield addr.ip[0]
+
+
+_ADDRESSES = list(_find_all_usable_ips())
 
 
 @pytest.mark.parametrize(

tests/test_runtime.py

@@ -1,5 +1,6 @@
 # pylint: disable=missing-function-docstring,missing-module-docstring
 import os
+import shutil
 from pathlib import Path
 from typing import Callable
 from typing import Type
@@ -8,7 +9,7 @@
 
 import pytest
 
-from pytest_container.runtime import LOCALHOST
+from pytest_container import helpers
 from pytest_container.runtime import DockerRuntime
 from pytest_container.runtime import OciRuntimeBase
 from pytest_container.runtime import PodmanRuntime
@@ -27,45 +28,6 @@ def container_runtime_envvar(request):
         yield
 
 
-# pylint: disable-next=unused-argument
-def _mock_run_success(*args, **kwargs):
-    class Succeeded:
-        """Class that mocks the returned object of `testinfra`'s `run`."""
-
-        @property
-        def succeeded(self) -> bool:
-            return True
-
-        @property
-        def rc(self) -> int:
-            return 0
-
-    return Succeeded()
-
-
-def generate_mock_fail(*, rc: int = 1, stderr: str = "failure!!"):
-    # pylint: disable-next=unused-argument
-    def mock_run_fail(cmd: str):
-        class Failure:
-            """Class that mocks the returned object of `testinfra`'s `run`."""
-
-            @property
-            def succeeded(self) -> bool:
-                return False
-
-            @property
-            def rc(self) -> int:
-                return rc
-
-            @property
-            def stderr(self) -> str:
-                return stderr
-
-        return Failure()
-
-    return mock_run_fail
-
-
 def _create_mock_exists(
     podman_should_exist: bool, docker_should_exist: bool
 ) -> Callable[[str], bool]:
@@ -96,8 +58,7 @@ def test_runtime_selection(
     runtime: OciRuntimeBase,
     monkeypatch: pytest.MonkeyPatch,
 ):
-    monkeypatch.setattr(LOCALHOST, "run", _mock_run_success)
-    monkeypatch.setattr(LOCALHOST, "exists", _create_mock_exists(True, True))
+    monkeypatch.setattr(shutil, "which", _create_mock_exists(True, True))
 
     assert get_selected_runtime() == runtime
 
@@ -107,7 +68,7 @@ def test_value_err_when_docker_and_podman_missing(
     runtime: str, monkeypatch: pytest.MonkeyPatch
 ) -> None:
     monkeypatch.setenv("CONTAINER_RUNTIME", runtime)
-    monkeypatch.setattr(LOCALHOST, "exists", _create_mock_exists(False, False))
+    monkeypatch.setattr(shutil, "which", _create_mock_exists(False, False))
     with pytest.raises(ValueError) as val_err_ctx:
         get_selected_runtime()
 
@@ -125,7 +86,11 @@ def test_runtime_construction_fails_if_ps_fails(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     stderr = "container runtime failed"
-    monkeypatch.setattr(LOCALHOST, "run", generate_mock_fail(stderr=stderr))
+    monkeypatch.setattr(
+        helpers,
+        "run_command",
+        lambda _: (1, "", stderr),
+    )
     with pytest.raises(RuntimeError) as rt_err_ctx:
         cls()
 
@@ -145,7 +110,9 @@ def test_buildah_version_parsing(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     monkeypatch.setattr(
-        LOCALHOST, "check_output", lambda _: f"buildah version {version_str}"
+        helpers,
+        "run_command",
+        lambda _: (0, f"buildah version {version_str}", ""),
     )
 
     assert _get_buildah_version() == expected_version
@@ -154,7 +121,7 @@ def test_buildah_version_parsing(
 def test_get_buildah_version_fails_on_unexpected_stdout(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
-    monkeypatch.setattr(LOCALHOST, "check_output", lambda _: "foobar")
+    monkeypatch.setattr(helpers, "run_command", lambda _: (0, "foobar", ""))
     with pytest.raises(RuntimeError) as rt_err_ctx:
         _get_buildah_version()
 

tests/test_volumes.py

@@ -2,6 +2,7 @@
 import os
 from os.path import abspath
 from os.path import join
+from pathlib import Path
 from typing import List
 
 import pytest
@@ -14,7 +15,6 @@
 from pytest_container.container import DerivedContainer
 from pytest_container.container import VolumeFlag
 from pytest_container.container import get_volume_creator
-from pytest_container.runtime import LOCALHOST
 from pytest_container.runtime import OciRuntimeBase
 
 from .images import LEAP_URL
@@ -118,8 +118,8 @@ def test_container_host_volumes(container_per_test: ContainerData):
     for vol in container_per_test.container.volume_mounts:
         assert isinstance(vol, BindMount)
         assert vol.host_path
-        dir_on_host = LOCALHOST.file(vol.host_path)
-        assert dir_on_host.exists and dir_on_host.is_directory
+        dir_on_host = Path(vol.host_path)
+        assert dir_on_host.is_dir()
 
         dir_in_container = container_per_test.connection.file(
             vol.container_path
@@ -142,8 +142,8 @@ def test_container_volume_host_writing(container_per_test: ContainerData):
     assert isinstance(vol, BindMount)
     assert vol.host_path
 
-    host_dir = LOCALHOST.file(vol.host_path)
-    assert not host_dir.listdir()
+    host_dir = Path(vol.host_path)
+    assert not list(host_dir.iterdir())
 
     container_dir = container_per_test.connection.file(vol.container_path)
     assert not container_dir.listdir()
@@ -265,9 +265,14 @@ def test_concurrent_container_volumes(container_per_test: ContainerData):
 def test_bind_mount_cwd(container: ContainerData):
     vol = container.container.volume_mounts[0]
     assert isinstance(vol, BindMount)
+    assert vol.host_path is not None
+
     assert container.connection.file("/src/").exists and sorted(
         container.connection.file("/src/").listdir()
-    ) == sorted(LOCALHOST.file(vol.host_path).listdir())
+    ) == sorted(
+        str(p.relative_to(vol.host_path))
+        for p in Path(vol.host_path).iterdir()
+    )
 
 
 def test_bind_mount_fails_when_host_path_not_present() -> None: