From e5ef3c1b7616446bbdeb8da2b0bbb203ccb582dd Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 27 Jun 2022 18:35:28 +0100 Subject: [PATCH] Tweak test config to remove always-skipped test --- unit_test/oci_container_test.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/unit_test/oci_container_test.py b/unit_test/oci_container_test.py index ca629119..baee3c3d 100644 --- a/unit_test/oci_container_test.py +++ b/unit_test/oci_container_test.py @@ -217,10 +217,10 @@ def test_environment_executor(container_engine): assert assignment.evaluated_value({}, container.environment_executor) == "42" -def test_podman_vfs(container_engine, tmp_path: Path, monkeypatch): +def test_podman_vfs(tmp_path: Path, monkeypatch, request): # Tests podman VFS, for the podman in docker use-case - if container_engine != "podman": - pytest.skip("podman is the only supported container engine for this test") + if not request.config.getoption("--run-podman"): + pytest.skip("need --run-podman option to run") # create the VFS configuration vfs_path = tmp_path / "podman_vfs" @@ -278,7 +278,7 @@ def test_podman_vfs(container_engine, tmp_path: Path, monkeypatch): monkeypatch.setenv("CONTAINERS_CONF", str(vfs_containers_conf_fpath)) monkeypatch.setenv("CONTAINERS_STORAGE_CONF", str(vfs_containers_storage_conf_fpath)) - with OCIContainer(engine=container_engine, image=DEFAULT_IMAGE) as container: + with OCIContainer(engine="podman", image=DEFAULT_IMAGE) as container: # test running a command assert container.call(["echo", "hello"], capture_output=True) == "hello\n"