Do not run Perl test on micro image because

it lacks with perl

Do not use micro version, but only a VERSION

Signed-off-by: Petr "Stone" Hracek <[email protected]>

Author: phracek

test/test_container_application.py

@@ -43,6 +43,7 @@ class TestNginxApplicationContainer:
 
     # test_application
     def test_application(self, app):
+        version = VERSION.replace("-micro", "")
         cid_file_name = "test-app"
         app.set_new_image(image_name=f"{IMAGE_NAME}-{cid_file_name}")
         assert app.create_container(
@@ -52,7 +53,7 @@ def test_application(self, app):
         cip = app.get_cip(cid_name=cid_file_name)
         assert PodmanCLIWrapper.podman_run_command(
             f"--rm {app.image_name} /bin/bash -c 'nginx -v'"
-        ).startswith(f"nginx version: nginx/{VERSION}")
+        ).startswith(f"nginx version: nginx/{version}")
         assert app.test_response(
             url=f"http://{cip}", expected_output="NGINX is working"
         )
@@ -72,6 +73,7 @@ def test_application(self, app):
 
     # test_application_user
     def test_application_user(self, app):
+        version = VERSION.replace("-micro", "")
         cid_file_name = "test-app"
         app.set_new_image(image_name=f"{IMAGE_NAME}-{cid_file_name}")
         assert app.create_container(
@@ -81,7 +83,7 @@ def test_application_user(self, app):
         cip = app.get_cip(cid_name=cid_file_name)
         assert PodmanCLIWrapper.podman_run_command(
             f"--rm {app.image_name} /bin/bash -c 'nginx -v'"
-        ).startswith(f"nginx version: nginx/{VERSION}")
+        ).startswith(f"nginx version: nginx/{version}")
         assert app.test_response(
             url=f"http://{cip}", expected_output="NGINX is working"
         )

test/test_container_basics.py

@@ -19,6 +19,7 @@
 IMAGE_NAME = os.getenv("IMAGE_NAME", None)
 OS = os.getenv("TARGET", None)
 
+
 image_name = IMAGE_NAME.split(":")[0]
 image_tag = IMAGE_NAME.split(":")[1]
 test_dir = os.path.join(os.getcwd())
@@ -49,17 +50,11 @@ def test_docker_run_usage(self):
             ) == 0
 
 
-        # test_scl_usage
-        @pytest.mark.parametrize(
-            "command,expected",
-            [
-                ("nginx -v", f"nginx version: nginx/{VERSION}"),
-            ]
-        )
-        def test_scl_usage(self, command, expected):
+        def test_scl_usage(self):
+            version = VERSION.replace("-micro", "")
             assert PodmanCLIWrapper.podman_run_command(
-                f"--rm {IMAGE_NAME} /bin/bash -c '{command}'"
-            ).startswith(expected)
+                f"--rm {IMAGE_NAME} /bin/bash -c 'nginx -v'"
+            ).startswith(f"nginx version: nginx/{version}")
 
         @pytest.mark.parametrize(
             "dockerfile",

test/test_container_example_app.py

@@ -66,6 +66,7 @@ def example_perl_test(request):
 class TestNginxExampleAppContainer:
 
     def test_run_app_test(self, example_app_test):
+        version = VERSION.replace("-micro", "")
         cid_file = example_app_test.app_name
         assert example_app_test.create_container(cid_file=cid_file, container_args="--user 10001")
         assert ContainerImage.wait_for_cid(cid_file=cid_file)
@@ -79,7 +80,7 @@ def test_run_app_test(self, example_app_test):
         assert not ContainerTestLibUtils.check_regexp_output(regexp_to_check="DNS_SERVER", logs_to_check=command)
         assert PodmanCLIWrapper.podman_run_command(
             f"--rm {example_app_test.image_name} /bin/bash -c 'nginx -v'"
-        ).startswith(f"nginx version: nginx/{VERSION}")
+        ).startswith(f"nginx version: nginx/{version}")
         assert example_app_test.test_response(
             url=f"http://{cip}", expected_output="NGINX is working"
         )
@@ -96,8 +97,9 @@ def test_run_app_test(self, example_app_test):
 class TestNginxExamplePerlAppContainer:
 
     def test_run_app_test(self, example_perl_test):
+        if VERSION.endswith("-micro"):
+            pytest.skip("Run the chosen tests (not for micro variant which lacks perl)")
         cid_file = example_perl_test.app_name
-        print(cid_file)
         example_perl_test.set_new_image(image_name=f"{IMAGE_NAME}-{cid_file}")
         assert example_perl_test.create_container(cid_file=cid_file, container_args="--user 10001")
         cid = example_perl_test.get_cid(cid_name=cid_file)