Couple fixes hit by real tests

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

Author: phracek

test/conftest.py

@@ -44,5 +44,5 @@
 
 
 def skip_helm_charts_tests():
-    if VARS.VERSION == "" and VARS.OS == "rhel8":
+    if VARS.VERSION == "5.32" and VARS.OS == "rhel8":
         skip(f"Skipping Helm Charts tests for {VARS.VERSION} on {VARS.OS}.")

test/test_container_basics.py

@@ -27,7 +27,7 @@ def test_docker_run_usage(self):
         ) == 0
 
     def test_scl_usage(self):
-        assert f"v{VARS.VERSION}" in PodmanCLIWrapper.podman_run_command(
+        assert f"v{VARS.VERSION_NO_FCGID}" in PodmanCLIWrapper.podman_run_command(
             f"--rm {VARS.IMAGE_NAME} /bin/bash -c 'perl --version'"
         )
 

test/test_ocp_latest_imagestreams.py

@@ -7,7 +7,7 @@
 class TestLatestImagestreams:
 
     def setup_method(self):
-        self.isc = ImageStreamChecker(working_dir=VARS.TEST_DIR / ".." / "..")
+        self.isc = ImageStreamChecker(working_dir=VARS.TEST_DIR.parent.parent)
 
     def test_latest_imagestream(self):
         self.latest_version = self.isc.get_latest_version()