Add container-pytest to NodeJS Container

20-minimal/test/__init__.py

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

20-minimal/test/conftest.py

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

20-minimal/test/run-pytest

@@ -0,0 +1 @@
+../../test/run-pytest

20-minimal/test/test-fips

@@ -0,0 +1 @@
+../../test/test-fips

20-minimal/test/test_container_apps.py

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

20-minimal/test/test_container_basics.py

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

22-minimal/test/__init__.py

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

22-minimal/test/conftest.py

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

22-minimal/test/run-pytest

@@ -0,0 +1 @@
+../../test/run-pytest

22-minimal/test/test-fips

@@ -0,0 +1 @@
+../../test/test-fips

22-minimal/test/test_container_apps.py

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

22-minimal/test/test_container_basics.py

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

24-minimal/test/__init__.py

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

24-minimal/test/conftest.py

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

24-minimal/test/run-pytest

@@ -0,0 +1 @@
+../../test/run-pytest

24-minimal/test/test-fips

@@ -0,0 +1 @@
+../../test/test-fips

24-minimal/test/test_container_apps.py

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

24-minimal/test/test_container_basics.py

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

test/conftest.py

@@ -0,0 +1,66 @@
+import os
+import sys
+
+from collections import namedtuple
+from pathlib import Path
+from pytest import skip
+
+from container_ci_suite.utils import check_variables
+
+if not check_variables():
+    sys.exit(1)
+
+OS = os.getenv("TARGET").lower()
+VERSION = os.getenv("VERSION")
+IMAGE_TAG = "15-c9s"
+PGSQL_IMAGE_TAG = f"postgresql:{IMAGE_TAG}"
+DEPLOYED_PGSQL_IMAGE = f"quay.io/sclorg/postgresql-{IMAGE_TAG}"
+TAGS = {
+    "rhel8": "-ubi8",
+    "rhel9": "-ubi9",
+    "rhel10": "-ubi10",
+}
+PSQL_TAGS = {
+    "rhel8": "-el8",
+    "rhel9": "-el9",
+    "rhel10": "-el10",
+}
+
+Vars = namedtuple(
+    "Vars",
+    [
+        "OS",
+        "VERSION",
+        "TAG",
+        "IMAGE_TAG",
+        "PSQL_TAGS",
+        "PGSQL_IMAGE_TAG",
+        "DEPLOYED_PGSQL_IMAGE",
+        "IMAGE_NAME",
+        "IS_MINIMAL",
+        "VERSION_NO_MINIMAL",
+        "SHORT_VERSION",
+        "TEST_DIR",
+    ],
+)
+
+
+VARS = Vars(
+    OS=OS,
+    VERSION=VERSION,
+    TAG=TAGS.get(OS),
+    IMAGE_TAG=IMAGE_TAG,
+    PSQL_TAGS=PSQL_TAGS.get(OS),
+    PGSQL_IMAGE_TAG=PGSQL_IMAGE_TAG,
+    DEPLOYED_PGSQL_IMAGE=DEPLOYED_PGSQL_IMAGE,
+    IMAGE_NAME=os.getenv("IMAGE_NAME"),
+    IS_MINIMAL="minimal" in VERSION,
+    VERSION_NO_MINIMAL=VERSION.replace("-minimal", ""),
+    SHORT_VERSION=VERSION.replace("-minimal", "").replace(".", ""),
+    TEST_DIR=Path(__file__).parent.absolute(),
+)
+
+
+def skip_for_minimal():
+    if "minimal" in VARS.VERSION:
+        skip("This test is not available for NodeJS minimal container")

test/run-openshift-pytest

@@ -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

test/run-pytest

@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# IMAGE_NAME specifies a name of the candidate image used for testing.
+# The image has to be available before this script is executed.
+# SINGLE_VERSION specifies the major version of httpd
+# OS specifies RHEL version (e.g. OS=rhel8)
+#
+
+THISDIR=$(dirname ${BASH_SOURCE[0]})
+
+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_*.py

test/test-fips/test.js

@@ -0,0 +1,3 @@
+const crypto = require('crypto');
+
+process.exit(crypto.getFips());

test/test-lib-nodejs.sh

@@ -495,12 +495,12 @@ function test_nodejs_fips_mode() {
   if [[ "$is_fips_enabled" == "0" ]]; then
     # FIPS disabled -- crypto.getFips() should return 0
     echo "Fips should be disabled"
-    docker run --rm ${IMAGE_NAME}-testfips /bin/bash -c "node -e 'const crypto = require(\"crypto\"); process.exit(crypto.getFips());'"
+    docker run --rm ${IMAGE_NAME}-testfips /bin/bash -c "node test.js"
     ct_check_testcase_result "$?"
   else
     # FIPS enabled -- crypto.getFips() should return 1
     echo "Fips should be enabled"
-    docker run --rm ${IMAGE_NAME}-testfips /bin/bash -c "! node -e 'const crypto = require(\"crypto\"); process.exit(crypto.getFips());'"
+    docker run --rm ${IMAGE_NAME}-testfips /bin/bash -c "! node test.js"
     ct_check_testcase_result "$?"
   fi
 }