Simplify test code given the changes from pytest_container#216

We now no longer have to perform the manual container & mark unbundling as
Container and DerivedContainer are now instances of ParameterSet as well

Author: dcermak

bci_tester/data.py

@@ -4,14 +4,14 @@
 from datetime import timedelta
 from pathlib import Path
 from typing import Iterable
+from typing import List
 from typing import Optional
 from typing import Sequence
 from typing import Tuple
 
 from pytest_container import DerivedContainer
+from pytest_container import PortForwarding
 from pytest_container.container import ContainerVolume
-from pytest_container.container import PortForwarding
-from pytest_container.container import container_and_marks_from_pytest_param
 from pytest_container.inspect import NetworkProtocol
 from pytest_container.runtime import LOCALHOST
 
@@ -306,7 +306,7 @@ def create_BCI(
     bci_type: ImageType = ImageType.LANGUAGE_STACK,
     container_user: Optional[str] = None,
     **kwargs,
-) -> ParameterSet:
+) -> DerivedContainer:
     """Creates a DerivedContainer wrapped in a pytest.param for the BCI with the
     given ``build_tag``.
 
@@ -421,14 +421,11 @@ def create_BCI(
             os.environ["SCC_CREDENTIAL_PASSWORD"]
         )
 
-    return pytest.param(
-        DerivedContainer(
-            base=baseurl,
-            containerfile=containerfile,
-            **kwargs,
-        ),
+    return DerivedContainer(
+        base=baseurl,
+        containerfile=containerfile,
         marks=marks,
-        id=f"{build_tag} from {baseurl}",
+        **kwargs,
     )
 
 
@@ -442,9 +439,9 @@ def create_BCI(
     )
 ]
 
-BASE_FIPS_CONTAINERS = []
-LTSS_BASE_CONTAINERS = []
-LTSS_BASE_FIPS_CONTAINERS = []
+BASE_FIPS_CONTAINERS: List[DerivedContainer] = []
+LTSS_BASE_CONTAINERS: List[DerivedContainer] = []
+LTSS_BASE_FIPS_CONTAINERS: List[DerivedContainer] = []
 
 if OS_VERSION == "tumbleweed":
     BASE_CONTAINER = create_BCI(
@@ -1156,23 +1153,19 @@ def create_BCI(
 )
 
 #: all containers with zypper and with the flag to launch them as root
-CONTAINERS_WITH_ZYPPER_AS_ROOT = []
-for param in CONTAINERS_WITH_ZYPPER:
+CONTAINERS_WITH_ZYPPER_AS_ROOT: List[DerivedContainer] = []
+for ctr in CONTAINERS_WITH_ZYPPER:
     # only modify the user for containers where `USER` is explicitly set,
     # atm this is no container
-    if param not in []:
-        CONTAINERS_WITH_ZYPPER_AS_ROOT.append(param)
+    if ctr not in []:
+        CONTAINERS_WITH_ZYPPER_AS_ROOT.append(ctr)
     else:
-        ctr, marks = container_and_marks_from_pytest_param(param)
         CONTAINERS_WITH_ZYPPER_AS_ROOT.append(
-            pytest.param(
-                DerivedContainer(
-                    base=ctr,
-                    extra_launch_args=(
-                        (ctr.extra_launch_args or []) + ["--user", "root"]
-                    ),
+            DerivedContainer(
+                base=ctr,
+                extra_launch_args=(
+                    (ctr.extra_launch_args or []) + ["--user", "root"]
                 ),
-                marks=marks,
             )
         )
 
@@ -1305,13 +1298,12 @@ def has_xfail(param: ParameterSet) -> bool:
                 return True
         return False
 
-    for param in ALL_CONTAINERS:
+    for ctr in ALL_CONTAINERS:
         # don't check containers which are known broken or excluded
-        if has_true_skipif(param) or has_xfail(param):
+        if has_true_skipif(ctr) or has_xfail(ctr):
             continue
 
-        ctr, marks = container_and_marks_from_pytest_param(param)
-        for mark in marks or []:
+        for mark in ctr.marks or []:
             assert mark.name in custom_markers.union(
                 {"xfail", "skipif", "skip"}
             ), (

tests/test_all.py

@@ -8,14 +8,14 @@
 import pathlib
 import xml.etree.ElementTree as ET
 from pathlib import Path
+from typing import List
 
 import packaging.version
 import pytest
 from _pytest.config import Config
 from pytest_container import Container
 from pytest_container import DerivedContainer
 from pytest_container import MultiStageBuild
-from pytest_container import container_and_marks_from_pytest_param
 from pytest_container import get_extra_build_args
 from pytest_container import get_extra_run_args
 from pytest_container.container import BindMount
@@ -249,16 +249,12 @@ def test_glibc_present(auto_container):
 # the host instead of passing it on via stdout which pollutes the logs making
 # them unreadable
 _CONTAINERS_WITH_VOLUME_MOUNT = []
-for param in CONTAINERS_WITH_ZYPPER_AS_ROOT:
-    ctr, marks = container_and_marks_from_pytest_param(param)
+for ctr in CONTAINERS_WITH_ZYPPER_AS_ROOT:
     new_vol_mounts = (ctr.volume_mounts or []) + [BindMount("/solv/")]
-    kwargs = {**ctr.__dict__}
+    kwargs = {**ctr.dict()}
     kwargs.pop("volume_mounts")
     _CONTAINERS_WITH_VOLUME_MOUNT.append(
-        pytest.param(
-            DerivedContainer(volume_mounts=new_vol_mounts, **kwargs),
-            marks=marks,
-        )
+        DerivedContainer(volume_mounts=new_vol_mounts, **kwargs),
     )
 
 
@@ -593,7 +589,7 @@ def test_certificates_are_present(
     ],
     indirect=True,
 )
-def test_container_build_and_repo(container_per_test, host):
+def test_container_build_and_repo(container_per_test: ContainerData):
     """Test all containers with zypper in them whether at least the ``SLE_BCI``
     repository is present (if the host is unregistered). If a custom value for
     the repository url has been supplied, then check that it is correct.
@@ -695,13 +691,12 @@ def test_container_build_and_repo(container_per_test, host):
     container_per_test.connection.run_expect([0], "zypper -n ref")
 
 
-_CONTAINERS_WITH_ZYPP_CREDENTIALS_MOUNTED = []
-for param in CONTAINERS_WITH_ZYPPER_AS_ROOT:
-    if param in LTSS_BASE_CONTAINERS:
+_CONTAINERS_WITH_ZYPP_CREDENTIALS_MOUNTED: List[DerivedContainer] = []
+for ctr in CONTAINERS_WITH_ZYPPER_AS_ROOT:
+    if ctr in LTSS_BASE_CONTAINERS:
         # LTSS containers are broken with the SLE BCI repo
         continue
 
-    ctr, marks = container_and_marks_from_pytest_param(param)
     new_vol_mounts = (ctr.volume_mounts or []) + [
         BindMount(
             container_path=ZYPP_CREDENTIALS_DIR,
@@ -713,11 +708,7 @@ def test_container_build_and_repo(container_per_test, host):
     kwargs.pop("volume_mounts")
 
     _CONTAINERS_WITH_ZYPP_CREDENTIALS_MOUNTED.append(
-        pytest.param(
-            DerivedContainer(**kwargs, volume_mounts=new_vol_mounts),
-            marks=marks,
-            id=param.id,
-        )
+        DerivedContainer(**kwargs, volume_mounts=new_vol_mounts)
     )
 
 

tests/test_base.py

@@ -8,7 +8,6 @@
 import pytest
 from pytest_container import DerivedContainer
 from pytest_container.container import ContainerData
-from pytest_container.container import container_and_marks_from_pytest_param
 from pytest_container.runtime import LOCALHOST
 
 from bci_tester.data import BASE_CONTAINER
@@ -246,20 +245,18 @@ def test_all_openssl_hashes_known(auto_container):
 
 #: This is the base container with additional launch arguments applied to it so
 #: that docker can be launched inside the container
-DIND_CONTAINER = pytest.param(
-    DerivedContainer(
-        base=container_and_marks_from_pytest_param(BASE_CONTAINER)[0],
-        **{
-            x: getattr(BASE_CONTAINER.values[0], x)
-            for x in BASE_CONTAINER.values[0].__dict__
-            if x not in ("extra_launch_args", "base")
-        },
-        extra_launch_args=[
-            "--privileged=true",
-            "-v",
-            "/var/run/docker.sock:/var/run/docker.sock",
-        ],
-    ),
+DIND_CONTAINER = DerivedContainer(
+    base=BASE_CONTAINER,
+    **{
+        x: getattr(BASE_CONTAINER, x)
+        for x in BASE_CONTAINER.dict()
+        if x not in ("extra_launch_args", "base")
+    },
+    extra_launch_args=[
+        "--privileged=true",
+        "-v",
+        "/var/run/docker.sock:/var/run/docker.sock",
+    ],
 )
 
 

tests/test_bind.py

@@ -15,7 +15,6 @@
 from dns.rrset import RRset
 from pytest_container import BindMount
 from pytest_container import DerivedContainer
-from pytest_container import container_and_marks_from_pytest_param
 from pytest_container.container import ContainerData
 from pytest_container.container import EntrypointSelection
 
@@ -117,32 +116,28 @@ def env_to_dict(env_stdout: str) -> Dict[str, str]:
     assert env_to_dict(env) == env_to_dict(env_with_source)
 
 
-_BIND_WITH_CUSTOM_CONF = []
-for param in BIND_CONTAINERS:
-    ctr, marks = container_and_marks_from_pytest_param(param)
+_BIND_WITH_CUSTOM_CONF: List[DerivedContainer] = []
+for ctr in BIND_CONTAINERS:
     _NAMED_CONF = "/etc/bind/named.conf"
     _BIND_WITH_CUSTOM_CONF.append(
-        pytest.param(
-            DerivedContainer(
-                base=ctr,
-                extra_environment_variables={"NAMED_CONF": _NAMED_CONF},
-                volume_mounts=[
-                    BindMount(
-                        container_path=_NAMED_CONF,
-                        host_path=str(
-                            Path(__file__).parent / "files" / "named.conf"
-                        ),
+        DerivedContainer(
+            base=ctr,
+            extra_environment_variables={"NAMED_CONF": _NAMED_CONF},
+            volume_mounts=[
+                BindMount(
+                    container_path=_NAMED_CONF,
+                    host_path=str(
+                        Path(__file__).parent / "files" / "named.conf"
                     ),
-                    BindMount(
-                        container_path="/etc/bind/db.blocked",
-                        host_path=str(
-                            Path(__file__).parent / "files" / "db.blocked"
-                        ),
+                ),
+                BindMount(
+                    container_path="/etc/bind/db.blocked",
+                    host_path=str(
+                        Path(__file__).parent / "files" / "db.blocked"
                     ),
-                ],
-                forwarded_ports=ctr.forwarded_ports,
-            ),
-            marks=marks,
+                ),
+            ],
+            forwarded_ports=ctr.forwarded_ports,
         )
     )
 
@@ -167,21 +162,16 @@ def test_custom_named_config(container: ContainerData) -> None:
     assert not empty_resp.answer
 
 
-_BIND_WITH_CUSTOM_CHECKER = []
+_BIND_WITH_CUSTOM_CHECKER: List[DerivedContainer] = []
 _CHECKER_TOUCHED_FILE = "/tmp/check-conf-worked"
-for param in BIND_CONTAINERS:
-    ctr, marks = container_and_marks_from_pytest_param(param)
-
+for ctr in BIND_CONTAINERS:
     _BIND_WITH_CUSTOM_CHECKER.append(
-        pytest.param(
-            DerivedContainer(
-                base=ctr,
-                extra_environment_variables={
-                    "NAMED_CHECKCONF_BIN": "/usr/bin/touch",
-                    "NAMED_CHECKCONF_ARGS": _CHECKER_TOUCHED_FILE,
-                },
-            ),
-            marks=marks,
+        DerivedContainer(
+            base=ctr,
+            extra_environment_variables={
+                "NAMED_CHECKCONF_BIN": "/usr/bin/touch",
+                "NAMED_CHECKCONF_ARGS": _CHECKER_TOUCHED_FILE,
+            },
         )
     )
 
@@ -198,20 +188,15 @@ def test_custom_checker(container: ContainerData) -> None:
     assert container.connection.file(_CHECKER_TOUCHED_FILE).exists
 
 
-_BIND_WITH_BASH = []
-for param in BIND_CONTAINERS:
-    ctr, marks = container_and_marks_from_pytest_param(param)
-
+_BIND_WITH_BASH: List[DerivedContainer] = []
+for ctr in BIND_CONTAINERS:
     _BIND_WITH_BASH.append(
-        pytest.param(
-            DerivedContainer(
-                base=ctr,
-                # don't launch bind as it chown's /var/lib/named
-                entry_point=EntrypointSelection.BASH,
-                # ignore healthcheck, bind is not running in this container
-                healthcheck_timeout=timedelta(seconds=-1),
-            ),
-            marks=marks,
+        DerivedContainer(
+            base=ctr,
+            # don't launch bind as it chown's /var/lib/named
+            entry_point=EntrypointSelection.BASH,
+            # ignore healthcheck, bind is not running in this container
+            healthcheck_timeout=timedelta(seconds=-1),
         )
     )
 

tests/test_dotnet.py

@@ -10,8 +10,8 @@
 
 import pytest
 from _pytest.mark import ParameterSet
+from pytest_container import DerivedContainer
 from pytest_container import GitRepositoryBuild
-from pytest_container import container_and_marks_from_pytest_param
 
 from bci_tester.data import DOTNET_ASPNET_8_0_CONTAINER
 from bci_tester.data import DOTNET_ASPNET_9_0_CONTAINER
@@ -36,13 +36,14 @@
 )
 
 
-def _generate_ctr_ver_param(ctr_ver: Tuple[ParameterSet, str]) -> ParameterSet:
+def _generate_ctr_ver_param(
+    ctr_ver: Tuple[DerivedContainer, str],
+) -> ParameterSet:
     """Converts a `(Container, Version)` tuple into a `pytest.param` that
     contains the exact same values but has the marks of the container.
 
     """
-    ctr, marks = container_and_marks_from_pytest_param(ctr_ver[0])
-    return pytest.param(ctr, ctr_ver[1], marks=marks or ())
+    return pytest.param(ctr_ver[0], ctr_ver[1], marks=ctr_ver[0].marks)
 
 
 @pytest.mark.parametrize(