Python tests for nginx-container

phracek · phracek · commit 050a5620865b · 2025-09-11T15:52:25.000+02:00
Signed-off-by: Petr "Stone" Hracek &lt;phracek@redhat.com&gt;
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_app.py b/1.20/test/test_container_example_app.py
@@ -0,0 +1 @@
+../../test/test_container_example_app.py
diff --git a/1.20/test/test_container_log.py b/1.20/test/test_container_log.py
@@ -0,0 +1 @@
+../../test/test_container_log.py
diff --git a/1.20/test/test_nginx_imagestream_s2i.py b/1.20/test/test_nginx_imagestream_s2i.py
diff --git a/1.20/test/test_nginx_imagestreams.py b/1.20/test/test_nginx_imagestreams.py
diff --git a/1.20/test/test_nginx_local_example.py b/1.20/test/test_nginx_local_example.py
diff --git a/1.20/test/test_nginx_remote_example.py b/1.20/test/test_nginx_remote_example.py
diff --git a/1.20/test/test_ocp_imagestream_s2i.py b/1.20/test/test_ocp_imagestream_s2i.py
@@ -0,0 +1 @@
+../../test/test_ocp_imagestream_s2i.py
diff --git a/1.20/test/test_ocp_imagestreams.py b/1.20/test/test_ocp_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_imagestreams.py
diff --git a/1.20/test/test_ocp_local_example.py b/1.20/test/test_ocp_local_example.py
@@ -0,0 +1 @@
+../../test/test_ocp_local_example.py
diff --git a/1.20/test/test_ocp_remote_example.py b/1.20/test/test_ocp_remote_example.py
@@ -0,0 +1 @@
+../../test/test_ocp_remote_example.py
diff --git a/1.20/test/test_ocp_shared_helm_imagestreams.py b/1.20/test/test_ocp_shared_helm_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_imagestreams.py
diff --git a/1.20/test/test_ocp_shared_helm_template.py b/1.20/test/test_ocp_shared_helm_template.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_template.py
diff --git a/1.20/test/test_ocp_template_example_app.py b/1.20/test/test_ocp_template_example_app.py
@@ -0,0 +1 @@
+../../test/test_ocp_template_example_app.py
diff --git a/1.20/test/test_shared_helm_nginx_imagestreams.py b/1.20/test/test_shared_helm_nginx_imagestreams.py
diff --git a/1.20/test/test_shared_helm_nginx_template.py b/1.20/test/test_shared_helm_nginx_template.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_app.py b/1.22/test/test_container_example_app.py
@@ -0,0 +1 @@
+../../test/test_container_example_app.py
diff --git a/1.22/test/test_container_log.py b/1.22/test/test_container_log.py
@@ -0,0 +1 @@
+../../test/test_container_log.py
diff --git a/1.22/test/test_nginx_imagestream_s2i.py b/1.22/test/test_nginx_imagestream_s2i.py
diff --git a/1.22/test/test_nginx_imagestreams.py b/1.22/test/test_nginx_imagestreams.py
diff --git a/1.22/test/test_nginx_local_example.py b/1.22/test/test_nginx_local_example.py
diff --git a/1.22/test/test_nginx_remote_example.py b/1.22/test/test_nginx_remote_example.py
diff --git a/1.22/test/test_ocp_imagestream_s2i.py b/1.22/test/test_ocp_imagestream_s2i.py
@@ -0,0 +1 @@
+../../test/test_ocp_imagestream_s2i.py
diff --git a/1.22/test/test_ocp_imagestreams.py b/1.22/test/test_ocp_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_imagestreams.py
diff --git a/1.22/test/test_ocp_local_example.py b/1.22/test/test_ocp_local_example.py
@@ -0,0 +1 @@
+../../test/test_ocp_local_example.py
diff --git a/1.22/test/test_ocp_remote_example.py b/1.22/test/test_ocp_remote_example.py
@@ -0,0 +1 @@
+../../test/test_ocp_remote_example.py
diff --git a/1.22/test/test_ocp_shared_helm_imagestreams.py b/1.22/test/test_ocp_shared_helm_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_imagestreams.py
diff --git a/1.22/test/test_ocp_shared_helm_template.py b/1.22/test/test_ocp_shared_helm_template.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_template.py
diff --git a/1.22/test/test_ocp_template_example_app.py b/1.22/test/test_ocp_template_example_app.py
@@ -0,0 +1 @@
+../../test/test_ocp_template_example_app.py
diff --git a/1.22/test/test_shared_helm_nginx_imagestreams.py b/1.22/test/test_shared_helm_nginx_imagestreams.py
diff --git a/1.22/test/test_shared_helm_nginx_template.py b/1.22/test/test_shared_helm_nginx_template.py
diff --git a/1.24/test/test_ocp_imagestreams.py b/1.24/test/test_ocp_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_imagestreams.py
diff --git a/1.24/test/test_ocp_local_example.py b/1.24/test/test_ocp_local_example.py
@@ -0,0 +1 @@
+../../test/test_ocp_local_example.py
diff --git a/1.24/test/test_ocp_remote_example.py b/1.24/test/test_ocp_remote_example.py
@@ -0,0 +1 @@
+../../test/test_ocp_remote_example.py
diff --git a/1.24/test/test_ocp_shared_helm_imagestreams.py b/1.24/test/test_ocp_shared_helm_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_imagestreams.py
diff --git a/1.24/test/test_ocp_shared_helm_template.py b/1.24/test/test_ocp_shared_helm_template.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_template.py
diff --git a/1.24/test/test_ocp_template_example_app.py b/1.24/test/test_ocp_template_example_app.py
@@ -0,0 +1 @@
+../../test/test_ocp_template_example_app.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_app.py b/1.26/test/test_container_example_app.py
@@ -0,0 +1 @@
+../../test/test_container_example_app.py
diff --git a/1.26/test/test_container_log.py b/1.26/test/test_container_log.py
@@ -0,0 +1 @@
+../../test/test_container_log.py
diff --git a/1.26/test/test_nginx_imagestream_s2i.py b/1.26/test/test_nginx_imagestream_s2i.py
diff --git a/1.26/test/test_nginx_imagestreams.py b/1.26/test/test_nginx_imagestreams.py
diff --git a/1.26/test/test_nginx_local_example.py b/1.26/test/test_nginx_local_example.py
diff --git a/1.26/test/test_nginx_remote_example.py b/1.26/test/test_nginx_remote_example.py
diff --git a/1.26/test/test_nginx_template_example_app.py b/1.26/test/test_nginx_template_example_app.py
diff --git a/1.26/test/test_ocp_imagestream_s2i.py b/1.26/test/test_ocp_imagestream_s2i.py
@@ -0,0 +1 @@
+../../test/test_ocp_imagestream_s2i.py
diff --git a/1.26/test/test_ocp_imagestreams.py b/1.26/test/test_ocp_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_imagestreams.py
diff --git a/1.26/test/test_ocp_local_example.py b/1.26/test/test_ocp_local_example.py
@@ -0,0 +1 @@
+../../test/test_ocp_local_example.py
diff --git a/1.26/test/test_ocp_remote_example.py b/1.26/test/test_ocp_remote_example.py
@@ -0,0 +1 @@
+../../test/test_ocp_remote_example.py
diff --git a/1.26/test/test_ocp_shared_helm_imagestreams.py b/1.26/test/test_ocp_shared_helm_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_imagestreams.py
diff --git a/1.26/test/test_ocp_shared_helm_template.py b/1.26/test/test_ocp_shared_helm_template.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_template.py
diff --git a/1.26/test/test_ocp_template_example_app.py b/1.26/test/test_ocp_template_example_app.py
@@ -0,0 +1 @@
+../../test/test_ocp_template_example_app.py
diff --git a/1.26/test/test_shared_helm_nginx_imagestreams.py b/1.26/test/test_shared_helm_nginx_imagestreams.py
diff --git a/1.26/test/test_shared_helm_nginx_template.py b/1.26/test/test_shared_helm_nginx_template.py
diff --git a/test/run b/test/run
@@ -420,7 +420,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
@@ -14,4 +14,4 @@ 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_example_app.py
+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
@@ -97,23 +97,3 @@ def test_application_user(self, app):
             url=f"http://{cip}", expected_code=404,
             page="/nginx-cfg/default.conf"
         )
-
-    # def test_default_page(self, app):
-    #     assert app.create_container(cid_file="test_default_page")
-    #     cip = app.get_cip("test_default_page")
-    #     assert cip
-    #     if OS == "c9s" or OS == "c10s":
-    #         response = "HTTP Server Test Page"
-    #     else:
-    #         response = "Test Page for the HTTP Server on"
-    #     assert app.test_response(url=f"{cip}", expected_code=403, expected_output=response, max_attempts=3)
-    #
-    # def test_run_as_root(self, app):
-    #     assert app.create_container(cid_file="test_default_page", container_args="--user 0")
-    #     cip = app.get_cip("test_default_page")
-    #     assert cip
-    #     if OS == "c9s" or OS == "c10s":
-    #         response = "HTTP Server Test Page"
-    #     else:
-    #         response = "Test Page for the HTTP Server on"
-    #     assert app.test_response(url=f"{cip}", expected_code=403, expected_output=response, max_attempts=3)
diff --git a/test/test_container_basics.py b/test/test_container_basics.py
@@ -84,81 +84,3 @@ def test_dockerfiles(self, app, dockerfile):
             assert cip
             assert app.test_response(url=f"{cip}", expected_code=200,
                                      expected_output="NGINX is working")
-
-
-        # # test_application_user
-        # def test_default_page(self, app):
-        #     assert app.create_container(cid_file="test_default_page")
-        #     cip = app.get_cip("test_default_page")
-        #     assert cip
-        #     if OS == "c9s" or OS == "c10s":
-        #         response = "HTTP Server Test Page"
-        #     else:
-        #         response = "Test Page for the HTTP Server on"
-        #     assert app.test_response(url=f"{cip}", expected_code=403, expected_output=response, max_attempts=3)
-
-        # @pytest.mark.parametrize(
-        #     "mpm_config",
-        #     [
-        #         "worker",
-        #         "event",
-        #         "prefork",
-        #     ]
-        # )
-        # def test_mpm_config(self, app, mpm_config):
-        #     cid_name = f"test_mpm_{mpm_config}"
-        #     assert app.create_container(cid_file=cid_name, container_args=f"-e HTTPD_MPM={mpm_config} --user 1001")
-        #     cid = app.get_cid(cid_name=cid_name)
-        #     cip = app.get_cip(cid_name=cid_name)
-        #     assert app.test_response(url=f"{cip}", port=8080, expected_code=403, expected_output=".*")
-        #     logs = app.get_logs(cid_name=cid_name)
-        #     assert ContainerTestLibUtils.check_regexp_output(
-        #         regexp_to_check=f"mpm_{mpm_config}:notice.*resuming normal operations",
-        #         logs_to_check=logs
-        #     )
-
-        # def test_log_to_data_volume(self, app):
-        #     logs_dir = ContainerTestLibUtils.create_local_temp_dir(
-        #         dir_name="/tmp/httpd-test_log_dir"
-        #     )
-        #     ContainerTestLibUtils.commands_to_run(
-        #         commands_to_run=[
-        #             f"mkdir -p {logs_dir}",
-        #             f"chown -R 1001:1001 {logs_dir}",
-        #             f"chcon -Rvt svirt_sandbox_file_t {logs_dir}/"
-        #         ]
-        #     )
-        #     assert app.create_container(
-        #         cid_file="test_log_dir",
-        #         container_args=f"-e HTTPD_LOG_TO_VOLUME=1 --user 0 -v {logs_dir}:/var/log/httpd"
-        #     )
-        #     cip = app.get_cip(cid_name="test_log_dir")
-        #     assert app.test_response(url=f"{cip}", port=8080, expected_code=403, expected_output=".*")
-        #     assert ContainerTestLibUtils.check_files_are_present(
-        #         dir_name=logs_dir, file_name_to_check=[
-        #             "access_log",
-        #             "error_log",
-        #             "ssl_access_log",
-        #             "ssl_error_log",
-        #             "ssl_request_log",
-        #         ]
-        #     )
-
-        # def test_data_volume(self, app):
-        #     logs_dir = ContainerTestLibUtils.create_local_temp_dir(
-        #         dir_name="/tmp/httpd-test-volume"
-        #     )
-        #     ContainerTestLibUtils.commands_to_run(
-        #         commands_to_run=[
-        #             f"mkdir -p {logs_dir}/html",
-        #             f"echo hello > {logs_dir}/html/index.html",
-        #             f"chown -R 1001:1001 {logs_dir}",
-        #             f"chcon -Rvt svirt_sandbox_file_t {logs_dir}/"
-        #         ]
-        #     )
-        #     assert app.create_container(
-        #         cid_file="doc_root",
-        #         container_args=f"-v {logs_dir}:/var/www"
-        #     )
-        #     cip = app.get_cip(cid_name="doc_root")
-        #     assert app.test_response(url=f"{cip}", port=8080, expected_code=200, expected_output="^hello$")
diff --git a/test/test_container_example_app.py b/test/test_container_example_app.py
diff --git a/test/test_dockerfile_processor.py b/test/test_dockerfile_processor.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_app.py`