Update test suite and remove obsolete conditions

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

Author: phracek

test/test-lib-nodejs.sh

@@ -457,12 +457,6 @@ function test_client_fastify() {
   if [[ "${VERSION}" == *"minimal"* ]]; then
     VERSION=$(echo "${VERSION}" | cut -d "-" -f 1)
   fi
-  if [[ "$VERSION" == "18" ]]; then
-    if [ "$OS" == "rhel8" ] || [ "$OS" == "rhel9" ] || [ "$OS" == "rhel10" ]; then
-      echo "Fastify is not supported in $VERSION and rhel8, rhel9, and rhel10"
-      return
-    fi
-  fi
   echo "Running fastify client test"
   test_running_client_js fastify
 }

test/test_shared_helm_nodejs_imagestreams.py

@@ -29,21 +29,21 @@ def teardown_method(self):
         self.hc_api.delete_project()
 
     @pytest.mark.parametrize(
-        "version,registry",
+        "version,registry,expected",
         [
-            ("22-ubi9", "registry.redhat.io/ubi9/nodejs-22:latest"),
-            ("22-ubi9-minimal", "registry.redhat.io/ubi9/nodejs-22-minimal:latest"),
-            ("20-ubi9", "registry.redhat.io/ubi9/nodejs-20:latest"),
-            ("20-ubi9-minimal", "registry.redhat.io/ubi9/nodejs-20-minimal:latest"),
-            ("20-ubi8", "registry.redhat.io/ubi8/nodejs-20:latest"),
-            ("20-ubi8-minimal", "registry.redhat.io/ubi8/nodejs-20-minimal:latest"),
-            ("18-ubi9", "registry.redhat.io/ubi9/nodejs-18:latest"),
-            ("18-ubi9-minimal", "registry.redhat.io/ubi9/nodejs-18-minimal:latest"),
-            ("18-ubi8", "registry.redhat.io/ubi8/nodejs-18:latest"),
-            ("18-ubi8-minimal", "registry.redhat.io/ubi8/nodejs-18-minimal:latest"),
+            ("22-ubi9", "registry.redhat.io/ubi9/nodejs-22:latest", True),
+            ("22-ubi9-minimal", "registry.redhat.io/ubi9/nodejs-22-minimal:latest", True),
+            ("20-ubi9", "registry.redhat.io/ubi9/nodejs-20:latest", True),
+            ("20-ubi9-minimal", "registry.redhat.io/ubi9/nodejs-20-minimal:latest", True),
+            ("20-ubi8", "registry.redhat.io/ubi8/nodejs-20:latest", True),
+            ("20-ubi8-minimal", "registry.redhat.io/ubi8/nodejs-20-minimal:latest", True),
+            ("18-ubi9", "registry.redhat.io/ubi9/nodejs-18:latest", False),
+            ("18-ubi9-minimal", "registry.redhat.io/ubi9/nodejs-18-minimal:latest", False),
+            ("18-ubi8", "registry.redhat.io/ubi8/nodejs-18:latest", False),
+            ("18-ubi8-minimal", "registry.redhat.io/ubi8/nodejs-18-minimal:latest", False),
         ],
     )
-    def test_package_imagestream(self, version, registry):
+    def test_package_imagestream(self, version, registry, expected):
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
-        assert self.hc_api.check_imagestreams(version=version, registry=registry)
+        assert self.hc_api.check_imagestreams(version=version, registry=registry) == expected