Add container PyTest suite to nginx-container.

phracek · phracek · commit 1223c90dd1b3 · 2025-10-14T11:55:09.000+02:00
All PyTest have naming `test_container_*.py`

Signed-off-by: Petr "Stone" Hracek &lt;phracek@redhat.com&gt;
diff --git a/1.20/test/conftest.py b/1.20/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/1.20/test/run-pytest b/1.20/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/1.20/test/test_container_application.py b/1.20/test/test_container_application.py
@@ -0,0 +1 @@
+../../test/test_container_application.py
diff --git a/1.20/test/test_container_basics.py b/1.20/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/1.20/test/test_container_example_apps.py b/1.20/test/test_container_example_apps.py
@@ -0,0 +1 @@
+../../test/test_container_example_apps.py
diff --git a/1.22/test/conftest.py b/1.22/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/1.22/test/constants.py b/1.22/test/constants.py
diff --git a/1.22/test/run-pytest b/1.22/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/1.22/test/test_container_application.py b/1.22/test/test_container_application.py
@@ -0,0 +1 @@
+../../test/test_container_application.py
diff --git a/1.22/test/test_container_basics.py b/1.22/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/1.22/test/test_container_example_apps.py b/1.22/test/test_container_example_apps.py
@@ -0,0 +1 @@
+../../test/test_container_example_apps.py
diff --git a/1.24/test/conftest.py b/1.24/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/1.24/test/run-pytest b/1.24/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/1.24/test/test_container_application.py b/1.24/test/test_container_application.py
@@ -0,0 +1 @@
+../../test/test_container_application.py
diff --git a/1.24/test/test_container_basics.py b/1.24/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/1.24/test/test_container_example_apps.py b/1.24/test/test_container_example_apps.py
@@ -0,0 +1 @@
+../../test/test_container_example_apps.py
diff --git a/1.26/test/conftest.py b/1.26/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/1.26/test/run-pytest b/1.26/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/1.26/test/test_container_application.py b/1.26/test/test_container_application.py
@@ -0,0 +1 @@
+../../test/test_container_application.py
diff --git a/1.26/test/test_container_basics.py b/1.26/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/1.26/test/test_container_example_apps.py b/1.26/test/test_container_example_apps.py
@@ -0,0 +1 @@
+../../test/test_container_example_apps.py
diff --git a/test/conftest.py b/test/conftest.py
@@ -0,0 +1,38 @@
+import os
+import sys
+
+from pathlib import Path
+from collections import namedtuple
+from pytest import skip
+
+from container_ci_suite.utils import check_variables
+
+if not check_variables():
+    sys.exit(1)
+
+Vars = namedtuple(
+    "Vars", [
+        "OS", "VERSION", "IMAGE_NAME", "VERSION_NO_MICRO", "SHORT_VERSION", "TEST_DIR"
+    ]
+)
+VERSION = os.getenv("VERSION")
+BRANCH_TO_TEST = "master"
+
+VARS = Vars(
+    OS=os.getenv("TARGET").lower(),
+    VERSION=VERSION,
+    IMAGE_NAME=os.getenv("IMAGE_NAME"),
+    VERSION_NO_MICRO=VERSION.replace("-micro", ""),
+    SHORT_VERSION=VERSION.replace("-micro", "").replace(".", ""),
+    TEST_DIR=Path(__file__).parent.absolute(),
+)
+
+TAGS = {
+    "rhel8": "-ubi8",
+    "rhel9": "-ubi9",
+    "rhel10": "-ubi10",
+}
+
+def skip_clear_env_tests():
+    if VARS.OS == "rhel8" and VERSION == "8.2":
+        skip(f"Skipping clear env tests for {VARS.VERSION} on {VARS.OS}.")
diff --git a/test/run b/test/run
@@ -421,7 +421,7 @@ TEST_SET=${TEST_LIST_HOOK_APP} ct_run_tests_from_testset "start-hook-test-app"
 # Run the chosen tests (not for micro variant which lacks perl)
 if ! [[ "${IMAGE_NAME}" =~ .*micro.* ]] ; then
   build_image "perl-test-app"
-  TEST_LIST=${TEST_LIST_PERL_APP} ct_run_tests_from_testset "perl-test-app"
+  TEST_SET=${TEST_LIST_PERL_APP} ct_run_tests_from_testset "perl-test-app"
 fi
 
 
diff --git a/test/run-pytest b/test/run-pytest
@@ -0,0 +1,17 @@
+#!/bin/bash
+#
+# IMAGE_NAME specifies a name of the candidate image used for testing.
+# The image has to be available before this script is executed.
+# SINGLE_VERSION specifies the major version of the MariaDB in format of X.Y
+# OS specifies RHEL version (e.g. OS=rhel8)
+#
+
+THISDIR=$(dirname ${BASH_SOURCE[0]})
+
+git show -s
+
+PYTHON_VERSION="3.12"
+if [[ ! -f "/usr/bin/python$PYTHON_VERSION" ]]; then
+  PYTHON_VERSION="3.13"
+fi
+cd "${THISDIR}" && "python${PYTHON_VERSION}" -m pytest -s -rA --showlocals -vv test_container_*.py
diff --git a/test/test_container_application.py b/test/test_container_application.py
@@ -0,0 +1,74 @@
+import pytest
+
+
+from pathlib import Path
+from container_ci_suite.container_lib import ContainerTestLib
+from container_ci_suite.engines.podman_wrapper import PodmanCLIWrapper
+from conftest import VARS
+
+test_app = VARS.TEST_DIR / "test-app"
+
+
+def build_s2i_app(app_path: Path) -> ContainerTestLib:
+    container_lib = ContainerTestLib(VARS.IMAGE_NAME)
+    app_name = app_path.name
+    s2i_app = container_lib.build_as_df(
+        app_path=app_path,
+        s2i_args="--pull-policy=never",
+        src_image=VARS.IMAGE_NAME,
+        dst_image=f"{VARS.IMAGE_NAME}-{app_name}"
+    )
+    return s2i_app
+
+
+class TestNginxApplicationContainer:
+
+    def setup_method(self):
+        self.s2i_app = build_s2i_app(app_path=test_app)
+
+    def teardown_method(self):
+        self.s2i_app.cleanup()
+
+    @pytest.mark.parametrize(
+        "container_arg",
+        [
+            "",
+            "--user 12345"
+        ]
+    )
+    def test_application(self, container_arg):
+        """
+        Test if container works under specific user
+        and not only with user --user 10001
+        """
+        cid_file_name = "test-app"
+        assert self.s2i_app.create_container(
+            cid_file_name=cid_file_name,
+            container_args=f"--user 10001 {container_arg}"
+        )
+        cip = self.s2i_app.get_cip(cid_file_name=cid_file_name)
+        assert cip
+        # nginx -v returns proper version
+        assert f"nginx/{VARS.VERSION_NO_MICRO}" in PodmanCLIWrapper.podman_run_command_and_remove(
+            cid_file_name=f"{VARS.IMAGE_NAME}-{cid_file_name}",
+            cmd="nginx -v"
+        )
+        # Response code from HTTP url is 200 and contains proper output
+        assert self.s2i_app.test_response(
+            url=f"http://{cip}", expected_output="NGINX is working"
+        )
+        # Response code from HTTP url is 200 and contains proper output
+        assert self.s2i_app.test_response(
+            url=f"http://{cip}", expected_output="NGINX2 is working",
+            host="localhost2"
+        )
+        # Response code from HTTP url is 200 and contains proper output
+        assert self.s2i_app.test_response(
+            url=f"http://{cip}", expected_output="NGINX2 is working",
+            page="/aliased/index2.html"
+        )
+        # Response code from HTTP url is 404 and nginx-cfg/default.conf is not accessible
+        assert self.s2i_app.test_response(
+            url=f"http://{cip}", expected_code=404,
+            page="/nginx-cfg/default.conf"
+        )
diff --git a/test/test_container_basics.py b/test/test_container_basics.py
@@ -0,0 +1,68 @@
+import pytest
+
+from container_ci_suite.container_lib import ContainerTestLib
+from container_ci_suite.engines.podman_wrapper import PodmanCLIWrapper
+from container_ci_suite.dockerfile_processor import DockerfileProcessor
+
+from conftest import VARS
+
+
+class TestNginxContainer:
+
+    def setup_method(self):
+        self.app = ContainerTestLib(image_name=VARS.IMAGE_NAME, s2i_image=True)
+
+    def teardown_method(self):
+        self.app.cleanup()
+
+    def test_run_s2i_usage(self):
+        """
+        Test if s2i usage works
+        """
+        output = self.app.s2i_usage()
+        assert output != ""
+
+    def test_docker_run_usage(self):
+        """
+        Test if container is runnable
+        """
+        assert PodmanCLIWrapper.call_podman_command(
+            cmd=f"run --rm {VARS.IMAGE_NAME} &>/dev/null",
+            return_output=False
+        ) == 0
+
+    def test_scl_usage(self):
+        """
+        Test if nginx -v returns proper output
+        """
+
+        assert f"nginx/{VARS.VERSION_NO_MICRO}" in PodmanCLIWrapper.podman_run_command_and_remove(
+            cid_file_name=VARS.IMAGE_NAME,
+            cmd="nginx -v"
+        )
+
+    @pytest.mark.parametrize(
+        "dockerfile",
+        [
+            "Dockerfile",
+            "Dockerfile.s2i"
+        ]
+    )
+    def test_dockerfiles(self, dockerfile):
+        """
+        Test if building nginx-container based on
+        examples/Dockerfile works
+        """
+        dp = DockerfileProcessor(dockerfile_path=f"{VARS.TEST_DIR}/examples/{dockerfile}")
+        dp.update_env_in_dockerfile(version=VARS.VERSION_NO_MICRO, what_to_replace="ENV NGINX_VERSION")
+        dp.update_variable_in_dockerfile(version=VARS.VERSION_NO_MICRO, variable="NGINX_VERSION")
+        new_docker_file = dp.create_temp_dockerfile()
+
+        assert self.app.build_test_container(
+            dockerfile=new_docker_file, app_url="https://github.com/sclorg/nginx-container.git",
+            app_dir="nginx-container"
+        )
+        assert self.app.test_app_dockerfile()
+        cip = self.app.get_cip()
+        assert cip
+        assert self.app.test_response(url=cip, expected_output="NGINX is working")
diff --git a/test/test_container_example_apps.py b/test/test_container_example_apps.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../test/test_container_application.py`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../test/test_container_example_apps.py`