diff --git a/tests/docker_ssi/test_docker_ssi.py b/tests/docker_ssi/test_docker_ssi.py index 93537e4c934..16731a5aca3 100644 --- a/tests/docker_ssi/test_docker_ssi.py +++ b/tests/docker_ssi/test_docker_ssi.py @@ -42,7 +42,8 @@ def setup_install_supported_runtime(self): @irrelevant(context.library == "python" and context.installed_language_runtime < "3.8.0") @irrelevant(context.library == "java" and context.installed_language_runtime < "1.8.0_0") @irrelevant(context.library == "php" and context.installed_language_runtime < "7.0") - @irrelevant(context.library == "nodejs" and context.installed_language_runtime < "17.0") + @irrelevant(context.library >= "nodejs@6.0.0-0" and context.installed_language_runtime < "22.0") + @irrelevant(context.library < "nodejs@6.0.0-0" and context.installed_language_runtime < "17.0") @irrelevant(context.library >= "python@4.0.0rc1" and context.installed_language_runtime < "3.9.0") @irrelevant(context.library == "ruby" and context.installed_language_runtime < "2.6.0") def test_install_supported_runtime(self): @@ -77,7 +78,8 @@ def test_install_weblog_running(self): ) @irrelevant(context.library == "java" and context.installed_language_runtime < "1.8.0_0") @irrelevant(context.library == "php" and context.installed_language_runtime < "7.0") - @irrelevant(context.library == "nodejs" and context.installed_language_runtime < "17.0") + @irrelevant(context.library >= "nodejs@6.0.0-0" and context.installed_language_runtime < "22.0") + @irrelevant(context.library < "nodejs@6.0.0-0" and context.installed_language_runtime < "17.0") @irrelevant(context.library >= "python@4.0.0rc1" and context.installed_language_runtime < "3.9.0") @irrelevant(context.library == "ruby" and context.installed_language_runtime < "2.6.0") def test_telemetry(self): @@ -106,7 +108,8 @@ def test_telemetry(self): @irrelevant(context.library == "php" and context.installed_language_runtime >= "7.0") @bug(context.library == "nodejs" and context.installed_language_runtime < "12.17.0", reason="INPLAT-252") @bug(context.library == "java" and context.installed_language_runtime == "1.7.0-201", reason="INPLAT-427") - @irrelevant(context.library == "nodejs" and context.installed_language_runtime >= "17.0") + @irrelevant(context.library >= "nodejs@6.0.0-0" and context.installed_language_runtime >= "22.0") + @irrelevant(context.library < "nodejs@6.0.0-0" and context.installed_language_runtime >= "17.0") @irrelevant(context.library == "dotnet" and context.installed_language_runtime >= "6.0.0") @irrelevant(context.library == "ruby" and context.installed_language_runtime >= "2.6.0") def test_telemetry_abort(self): @@ -145,7 +148,8 @@ def setup_instrumentation_source_ssi(self): @irrelevant(context.library == "python" and context.installed_language_runtime < "3.9.0") @irrelevant(context.library == "java" and context.installed_language_runtime < "1.8.0_0") @irrelevant(context.library == "php" and context.installed_language_runtime < "7.1") - @irrelevant(context.library == "nodejs" and context.installed_language_runtime < "17.0") + @irrelevant(context.library >= "nodejs@6.0.0-0" and context.installed_language_runtime < "22.0") + @irrelevant(context.library < "nodejs@6.0.0-0" and context.installed_language_runtime < "17.0") @irrelevant(context.library >= "python@4.0.0.dev" and context.installed_language_runtime < "3.9.0") @irrelevant(context.library < "python@4.0.0.dev" and context.installed_language_runtime < "3.8.0") @irrelevant(context.library == "ruby" and context.installed_language_runtime < "2.6.0") @@ -168,7 +172,8 @@ def setup_injection_metadata(self): @irrelevant(context.library == "python" and context.installed_language_runtime < "3.8.0") @irrelevant(context.library == "java" and context.installed_language_runtime < "1.8.0_0") @irrelevant(context.library == "php" and context.installed_language_runtime < "7.1") - @irrelevant(context.library == "nodejs" and context.installed_language_runtime < "17.0") + @irrelevant(context.library >= "nodejs@6.0.0-0" and context.installed_language_runtime < "22.0") + @irrelevant(context.library < "nodejs@6.0.0-0" and context.installed_language_runtime < "17.0") @irrelevant(context.library >= "python@4.0.0rc1" and context.installed_language_runtime < "3.9.0") def test_injection_metadata(self): logger.info("Testing injection result variables") diff --git a/tests/docker_ssi/test_docker_ssi_appsec.py b/tests/docker_ssi/test_docker_ssi_appsec.py index 18597c58f81..ae91a3ac19a 100644 --- a/tests/docker_ssi/test_docker_ssi_appsec.py +++ b/tests/docker_ssi/test_docker_ssi_appsec.py @@ -17,7 +17,8 @@ def setup_telemetry_source_ssi(self): @irrelevant(context.library == "java" and context.installed_language_runtime < "1.8.0_0") @irrelevant(context.library == "php" and context.installed_language_runtime < "7.1") - @irrelevant(context.library == "nodejs" and context.installed_language_runtime < "17.0") + @irrelevant(context.library >= "nodejs@6.0.0-0" and context.installed_language_runtime < "22.0") + @irrelevant(context.library < "nodejs@6.0.0-0" and context.installed_language_runtime < "17.0") @irrelevant(context.library >= "python@4.0.0.dev" and context.installed_language_runtime < "3.9.0") @irrelevant(context.library < "python@4.0.0.dev" and context.installed_language_runtime < "3.8.0") @irrelevant(context.library == "ruby" and context.installed_language_runtime < "2.6.0", reason="Ruby 2.6+ required") diff --git a/tests/docker_ssi/test_docker_ssi_crash.py b/tests/docker_ssi/test_docker_ssi_crash.py index 2c9a6a9df32..c2663aedf5d 100644 --- a/tests/docker_ssi/test_docker_ssi_crash.py +++ b/tests/docker_ssi/test_docker_ssi_crash.py @@ -36,7 +36,8 @@ def setup_crash(self): @features.ssi_crashtracking @irrelevant(context.library == "python" and context.installed_language_runtime < "3.7.0") - @irrelevant(context.library == "nodejs" and context.installed_language_runtime < "17.0") + @irrelevant(context.library >= "nodejs@6.0.0-0" and context.installed_language_runtime < "22.0") + @irrelevant(context.library < "nodejs@6.0.0-0" and context.installed_language_runtime < "17.0") @irrelevant(context.library == "ruby" and context.installed_language_runtime < "2.6.0") def test_crash(self): """Validate that a crash report is generated when the application crashes"""