Fix missing symlink to conftest.py in each directory.

Fix skipping RHEL8 tests for FIPS.

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>

Author: phracek

2.5/test/conftest.py

@@ -0,0 +1 @@
+../../test/conftest.py

2.5/test/conftest.py

@@ -0,0 +1 @@
+../../test/conftest.py

3.0/test/conftest.py

@@ -0,0 +1 @@
+../../test/conftest.py

3.0/test/conftest.py

@@ -4,7 +4,6 @@
 
 from pathlib import Path
 from collections import namedtuple
-from pytest import skip
 
 from container_ci_suite.utils import check_variables
 
@@ -66,11 +65,3 @@ def fips_enabled():
     if os.path.exists("/proc/sys/crypto/fips_enabled"):
         return Path("/proc/sys/crypto/fips_enabled").read_text() == "1"
     return False
-
-
-def skip_fips_tests_rhel8():
-    """
-    Skip FIPS tests on RHEL8.
-    """
-    if VARS.OS == "rhel8":
-        skip("Skipping FIPS tests on RHEL8 because FIPS is enabled.")

3.1/test/conftest.py

@@ -8,4 +8,4 @@
 
 THISDIR=$(dirname ${BASH_SOURCE[0]})
 
-cd "${THISDIR}" && python3.12 -m pytest -s -rA  --showlocals -vv test_*.py
+cd "${THISDIR}" && python3.12 -m pytest -s -rA  --showlocals -vv test_ocp_*.py

3.1/test/conftest.py

@@ -15,7 +15,7 @@
 test_ports = PodmanCLIWrapper.podman_inspect(
     field="{{range $key, $value := .Config.ExposedPorts }}{{$key}}{{end}}",
     src_image=VARS.IMAGE_NAME,
-).split("/")
+)
 print(f"The exposed ports are: {test_ports}")
 
 
@@ -75,7 +75,9 @@ def test_application(self):
             )
         )
         # Response code from HTTP url is 200
-        assert self.s2i_app.test_response(url=f"http://{cip}", port=test_ports[0])
+        assert self.s2i_app.test_response(
+            url=f"http://{cip}", port=test_ports.split("/")[0]
+        )
 
 
 class TestRubyPumaTestAppContainer:
@@ -115,7 +117,9 @@ def test_application(self):
             )
         )
         # Response code from HTTP url is 200
-        assert self.s2i_app.test_response(url=f"http://{cip}", port=test_ports[0])
+        assert self.s2i_app.test_response(
+            url=f"http://{cip}", port=test_ports.split("/")[0]
+        )
 
 
 class TestRubyRackTestAppContainer:
@@ -155,4 +159,6 @@ def test_application(self):
             )
         )
         # Response code from HTTP url is 200
-        assert self.s2i_app.test_response(url=f"http://{cip}", port=test_ports[0])
+        assert self.s2i_app.test_response(
+            url=f"http://{cip}", port=test_ports.split("/")[0]
+        )

test/conftest.py

@@ -1,8 +1,11 @@
+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, skip_fips_tests_rhel8, fips_enabled
+from conftest import VARS, fips_enabled
 
 fips_test_app = VARS.TEST_DIR / "test-fips"
 
@@ -25,7 +28,7 @@ def build_fips_test_app(app_path: Path) -> ContainerTestLib:
 class TestRubyFipsModeContainer:
     """
     Test if container works under specific user
-    and not only with user --user 10001
+    and not only with user --user 100001
     """
 
     def setup_method(self):
@@ -45,8 +48,8 @@ def test_fips_mode(self):
         Test if container works under specific user
         and not only with user --user 10001
         """
-        skip_fips_tests_rhel8()
-        print(f"Is FIPS enabled? {fips_enabled()}")
+        if VARS.OS == "rhel8":
+            pytest.skip("Do not execute on RHEL8")
         if fips_enabled():
             output = PodmanCLIWrapper.podman_run_command_and_remove(
                 cid_file_name={VARS.IMAGE_NAME},
@@ -79,14 +82,16 @@ def teardown_method(self):
         """
         Cleanup the test environment.
         """
-        self.fips_app.cleanup()
+        if self.fips_app:
+            self.fips_app.cleanup()
 
     def test_application(self):
         """
         Test if container works under specific user
         and not only with user --user 100001
         """
-        skip_fips_tests_rhel8()
+        if VARS.OS == "rhel8":
+            pytest.skip("Do not execute on RHEL8")
         cid_file_name = self.fips_app.app_name
         assert self.fips_app.create_container(
             cid_file_name=cid_file_name, container_args="--user 100001"