diff --git a/bin/tests/system/chain/prereq.sh b/bin/tests/system/chain/prereq.sh index fe84055246..0d6e2b45d4 100644 --- a/bin/tests/system/chain/prereq.sh +++ b/bin/tests/system/chain/prereq.sh @@ -13,11 +13,6 @@ . ../conf.sh -if ! ${PYTHON} -c 'import dns'; then - echo_i "python dns module is required" - exit 1 -fi - if ! ${PERL} -MNet::DNS -e ''; then echo_i "perl Net::DNS module is required" exit 1 diff --git a/bin/tests/system/cookie/prereq.sh b/bin/tests/system/cookie/prereq.sh deleted file mode 100644 index b6b005f8ff..0000000000 --- a/bin/tests/system/cookie/prereq.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# Copyright (C) Internet Systems Consortium, Inc. ("ISC") -# -# SPDX-License-Identifier: MPL-2.0 -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, you can obtain one at https://mozilla.org/MPL/2.0/. -# -# See the COPYRIGHT file distributed with this work for additional -# information regarding copyright ownership. - -. ../conf.sh - -if ! ${PYTHON} -c 'import dns'; then - echo_i "python dns module is required" - exit 1 -fi - -exit 0 diff --git a/bin/tests/system/digdelv/prereq.sh b/bin/tests/system/digdelv/prereq.sh index 32889aa251..c52be9c97a 100644 --- a/bin/tests/system/digdelv/prereq.sh +++ b/bin/tests/system/digdelv/prereq.sh @@ -13,11 +13,6 @@ . ../conf.sh -if ! ${PYTHON} -c 'import dns'; then - echo_i "python dns module is required" - exit 1 -fi - if ! ${PERL} -MNet::DNS -e ''; then echo_i "perl Net::DNS module is required" exit 1 diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh index 899aa513cb..265366a247 100644 --- a/bin/tests/system/digdelv/tests.sh +++ b/bin/tests/system/digdelv/tests.sh @@ -69,9 +69,7 @@ KEYDATA="$(sed /dev/null && HAS_PYYAML=1 -fi +$PYTHON -c "import yaml" 2>/dev/null && HAS_PYYAML=1 # # test whether ans7/ans.pl will be able to send a UPDATE response. diff --git a/bin/tests/system/dnssec/prereq.sh b/bin/tests/system/dnssec/prereq.sh index 32889aa251..c52be9c97a 100644 --- a/bin/tests/system/dnssec/prereq.sh +++ b/bin/tests/system/dnssec/prereq.sh @@ -13,11 +13,6 @@ . ../conf.sh -if ! ${PYTHON} -c 'import dns'; then - echo_i "python dns module is required" - exit 1 -fi - if ! ${PERL} -MNet::DNS -e ''; then echo_i "perl Net::DNS module is required" exit 1 diff --git a/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh index 261384fd1f..d4bcdd30ea 100644 --- a/bin/tests/system/dnstap/tests.sh +++ b/bin/tests/system/dnstap/tests.sh @@ -549,9 +549,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi status=$((status + ret)) HAS_PYYAML=0 -if [ -x "$PYTHON" ]; then - $PYTHON -c "import yaml" 2>/dev/null && HAS_PYYAML=1 -fi +$PYTHON -c "import yaml" 2>/dev/null && HAS_PYYAML=1 if [ $HAS_PYYAML -ne 0 ]; then echo_i "checking dnstap-read YAML output" diff --git a/bin/tests/system/doth/tests.sh b/bin/tests/system/doth/tests.sh index 3559c6757c..753cc0f8d8 100644 --- a/bin/tests/system/doth/tests.sh +++ b/bin/tests/system/doth/tests.sh @@ -22,11 +22,9 @@ msg_peer_verification_failed=";; TLS peer certificate verification" ca_file="./CA/CA.pem" -if [ -x "$PYTHON" ]; then - OPENSSL_VERSION=$("$PYTHON" "$TOP_SRCDIR/bin/tests/system/doth/get_openssl_version.py") - OPENSSL_VERSION_MAJOR=$(echo "$OPENSSL_VERSION" | cut -d ' ' -f 1) - OPENSSL_VERSION_MINOR=$(echo "$OPENSSL_VERSION" | cut -d ' ' -f 2) -fi +OPENSSL_VERSION=$("$PYTHON" "$TOP_SRCDIR/bin/tests/system/doth/get_openssl_version.py") +OPENSSL_VERSION_MAJOR=$(echo "$OPENSSL_VERSION" | cut -d ' ' -f 1) +OPENSSL_VERSION_MINOR=$(echo "$OPENSSL_VERSION" | cut -d ' ' -f 2) # According to the RFC 8310, Section 8.1, Subject field MUST # NOT be inspected when verifying a hostname when using @@ -43,12 +41,10 @@ fi # On the platforms with too old TLS versions, e.g. RedHat 7, we should # ignore the tests checking the correct handling of absence of # SubjectAltName. -if [ -n "$OPENSSL_VERSION" ]; then - if [ $OPENSSL_VERSION_MAJOR -gt 1 ]; then - run_san_tests=1 - elif [ $OPENSSL_VERSION_MAJOR -eq 1 ] && [ $OPENSSL_VERSION_MINOR -ge 1 ]; then - run_san_tests=1 - fi +if [ $OPENSSL_VERSION_MAJOR -gt 1 ]; then + run_san_tests=1 +elif [ $OPENSSL_VERSION_MAJOR -eq 1 ] && [ $OPENSSL_VERSION_MINOR -ge 1 ]; then + run_san_tests=1 fi dig_with_tls_opts() { @@ -843,11 +839,7 @@ test_opcodes FORMERR 4 5 n=$((n + 1)) echo_i "checking server quotas for both encrypted and unencrypted HTTP ($n)" ret=0 -if [ -x "$PYTHON" ]; then - BINDHOST="10.53.0.1" "$PYTHON" "$TOP_SRCDIR/bin/tests/system/doth/stress_http_quota.py" || ret=$? -else - echo_i "Python is not available. Skipping the test..." -fi +BINDHOST="10.53.0.1" "$PYTHON" "$TOP_SRCDIR/bin/tests/system/doth/stress_http_quota.py" || ret=$? if [ $ret != 0 ]; then echo_i "failed"; fi status=$((status + ret)) diff --git a/bin/tests/system/forward/prereq.sh b/bin/tests/system/forward/prereq.sh index 32889aa251..c52be9c97a 100644 --- a/bin/tests/system/forward/prereq.sh +++ b/bin/tests/system/forward/prereq.sh @@ -13,11 +13,6 @@ . ../conf.sh -if ! ${PYTHON} -c 'import dns'; then - echo_i "python dns module is required" - exit 1 -fi - if ! ${PERL} -MNet::DNS -e ''; then echo_i "perl Net::DNS module is required" exit 1 diff --git a/bin/tests/system/kasp.sh b/bin/tests/system/kasp.sh index 636d3c4da2..be0f6082b7 100644 --- a/bin/tests/system/kasp.sh +++ b/bin/tests/system/kasp.sh @@ -299,12 +299,11 @@ set_keytime() { # $3: Value # $4: Additional time. set_addkeytime() { - if [ -x "$PYTHON" ]; then - # Convert "%Y%m%d%H%M%S" format to epoch seconds. - # Then, add the additional time (can be negative). - _value=$3 - _plus=$4 - $PYTHON >python.out.$ZONE.$1.$2 <python.out.$ZONE.$1.$2 </dev/null; then - : - else - echo_i "This test requires the dnspython >= 2.0.0 module." >&2 - exit 1 - fi -else - echo_i "This test requires Python and the dnspython module." >&2 - exit 1 -fi - -exit 0