diff --git a/data/console/test_openssl_nodejs.sh b/data/console/test_openssl_nodejs.sh index f435aeb7c802..9febb591bc27 100644 --- a/data/console/test_openssl_nodejs.sh +++ b/data/console/test_openssl_nodejs.sh @@ -68,7 +68,7 @@ test_node_version(){ quilt setup "../SPECS/nodejs$VERSION.spec" pushd "$SOURCE_DIR" quilt push -a - if [ "$VERSION" -eq 18 ]; then + if [[ "$VERSION" -eq 18 && -e /root/crypto_rsa_dsa.patch ]]; then patch test/parallel/test-crypto-rsa-dsa.js < /root/crypto_rsa_dsa.patch fi # Run all test-crypto and test-tls available diff --git a/tests/console/openssl_nodejs.pm b/tests/console/openssl_nodejs.pm index 4640afe50b11..0d8a7547bac1 100644 --- a/tests/console/openssl_nodejs.pm +++ b/tests/console/openssl_nodejs.pm @@ -18,6 +18,7 @@ use testapi; use serial_terminal 'select_serial_terminal'; use utils; use repo_tools 'generate_version'; +use version_utils qw(is_sle); sub run { #Preparation @@ -31,7 +32,7 @@ sub run { $source_repo = script_output(q{zypper lr | grep Source-Pool | awk -F '|' '/Web_and_Scripting_Module/ {print $2}'}); zypper_call("mr -e $source_repo", exitcode => [0, 3]); } - assert_script_run 'wget --quiet ' . data_url('qam/crypto_rsa_dsa.patch'); + assert_script_run 'wget --quiet ' . data_url('qam/crypto_rsa_dsa.patch') unless get_var('FLAVOR') =~ /TERADATA/ || is_sle('=12-sp5'); assert_script_run 'wget --quiet ' . data_url('console/test_openssl_nodejs.sh'); assert_script_run 'chmod +x test_openssl_nodejs.sh'; assert_script_run "./test_openssl_nodejs.sh $os_version", 900;