From 30fda4cb5294bf8c8472a23006fbb2775e3963b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 10 Feb 2022 17:36:08 +0100 Subject: [PATCH] Remove the keep-response-order system test Remove the keep-response-order from the system test and cleanup the pipelined system test to be shell check clean and use the helper functions. --- .../checkconf/bad-keep-response-order.conf | 18 ---- bin/tests/system/checkconf/good.conf | 3 - bin/tests/system/pipelined/clean.sh | 8 +- bin/tests/system/pipelined/tests.sh | 93 +++++++++---------- bin/tests/system/tcp/ns7/named.conf.in | 1 - 5 files changed, 47 insertions(+), 76 deletions(-) delete mode 100644 bin/tests/system/checkconf/bad-keep-response-order.conf diff --git a/bin/tests/system/checkconf/bad-keep-response-order.conf b/bin/tests/system/checkconf/bad-keep-response-order.conf deleted file mode 100644 index a3685d7437..0000000000 --- a/bin/tests/system/checkconf/bad-keep-response-order.conf +++ /dev/null @@ -1,18 +0,0 @@ -/* - * 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. - */ - -options { - keep-response-order { - does_not_exist; - }; -}; diff --git a/bin/tests/system/checkconf/good.conf b/bin/tests/system/checkconf/good.conf index 897dc864d6..100ec3a827 100644 --- a/bin/tests/system/checkconf/good.conf +++ b/bin/tests/system/checkconf/good.conf @@ -54,9 +54,6 @@ options { heartbeat-interval 30; hostname none; interface-interval 30; - keep-response-order { - 10.0.10.0/24; - }; listen-on port 90 { "any"; }; diff --git a/bin/tests/system/pipelined/clean.sh b/bin/tests/system/pipelined/clean.sh index 12c17337d0..7ec0aad06b 100644 --- a/bin/tests/system/pipelined/clean.sh +++ b/bin/tests/system/pipelined/clean.sh @@ -11,9 +11,9 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. -rm -f */named.conf -rm -f */named.memstats -rm -f */named.run -rm -f raw* output* +rm -f ./*/named.conf +rm -f ./*/named.memstats +rm -f ./*/named.run* +rm -f raw* output* ./*.out.* rm -f ns*/named.lock rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/pipelined/tests.sh b/bin/tests/system/pipelined/tests.sh index 34a105f5f7..df89da1b07 100644 --- a/bin/tests/system/pipelined/tests.sh +++ b/bin/tests/system/pipelined/tests.sh @@ -13,68 +13,61 @@ . ../conf.sh -MDIGOPTS="-p ${PORT}" -RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s" +mdig_with_opts() { + "$MDIG" -p "${PORT}" "${@}" +} + +rndccmd() { + "$RNDC" -c ../common/rndc.conf -p "${CONTROLPORT}" -s "${@}" +} + +pipequeries() { + "$PIPEQUERIES" -p "${PORT}" +} status=0 - -echo_i "check pipelined TCP queries" +n=1 ret=0 -$PIPEQUERIES -p ${PORT} < input > raw || ret=1 -awk '{ print $1 " " $5 }' < raw > output -sort < output > output-sorted -diff ref output-sorted || { ret=1 ; echo_i "diff sorted failed"; } -diff ref output > /dev/null && { ret=1 ; echo_i "diff out of order failed"; } -if [ $ret != 0 ]; then echo_i "failed"; fi -status=`expr $status + $ret` -echo_i "check pipelined TCP queries using mdig" -ret=0 -$RNDCCMD 10.53.0.4 flush -sleep 1 -$MDIG $MDIGOPTS +noall +answer +vc -f input -b 10.53.0.4 @10.53.0.4 > raw.mdig -awk '{ print $1 " " $5 }' < raw.mdig > output.mdig -sort < output.mdig > output-sorted.mdig -diff ref output-sorted.mdig || { ret=1 ; echo_i "diff sorted failed"; } -diff ref output.mdig > /dev/null && { ret=1 ; echo_i "diff out of order failed"; } +echo_i "check pipelined TCP queries ($n)" +pipequeries < input > raw.$n || ret=1 +awk '{ print $1 " " $5 }' < raw.$n > output.$n +sort < output.$n > output-sorted.$n +diff ref output-sorted.$n || { ret=1 ; echo_i "diff sorted failed"; } +diff ref output.$n > /dev/null && { ret=1 ; echo_i "diff out of order failed"; } if [ $ret != 0 ]; then echo_i "failed"; fi -status=`expr $status + $ret` +status=$((status+ret)) +n=$((n+1)) +ret=0 -echo_i "check keep-response-order" -ret=0 -$RNDCCMD 10.53.0.4 flush -sleep 1 -$PIPEQUERIES -p ${PORT} ++ < inputb > rawb || ret=1 -awk '{ print $1 " " $5 }' < rawb > outputb -diff refb outputb || ret=1 +echo_i "check pipelined TCP queries using mdig ($n)" +rndccmd 10.53.0.4 flush +wait_for_log 10 "flushing caches in all views succeeded" ns4/named.run +mdig_with_opts +noall +answer +vc -f input -b 10.53.0.4 @10.53.0.4 > raw.mdig.$n +awk '{ print $1 " " $5 }' < raw.mdig.$n > output.mdig.$n +sort < output.mdig.$n > output-sorted.mdig.$n +diff ref output-sorted.mdig.$n || { ret=1 ; echo_i "diff sorted failed"; } +diff ref output.mdig.$n > /dev/null && { ret=1 ; echo_i "diff out of order failed"; } if [ $ret != 0 ]; then echo_i "failed"; fi -status=`expr $status + $ret` +status=$((status+ret)) +n=$((n+1)) +ret=0 -echo_i "check keep-response-order using mdig" -ret=0 -$RNDCCMD 10.53.0.4 flush -sleep 1 -$MDIG $MDIGOPTS +noall +answer +vc -f inputb -b 10.53.0.7 @10.53.0.4 > rawb.mdig -awk '{ print $1 " " $5 }' < rawb.mdig > outputb.mdig -diff refb outputb.mdig || ret=1 +echo_i "check mdig -4 -6 ($n)" +mdig_with_opts -4 -6 -f input @10.53.0.4 > output.mdig.$n 2>&1 && ret=1 +grep "only one of -4 and -6 allowed" output.mdig.$n > /dev/null || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi -status=`expr $status + $ret` +status=$((status+ret)) +n=$((n+1)) +ret=0 -echo_i "check mdig -4 -6" -ret=0 -$RNDCCMD 10.53.0.4 flush -sleep 1 -$MDIG $MDIGOPTS -4 -6 -f input @10.53.0.4 > output46.mdig 2>&1 && ret=1 -grep "only one of -4 and -6 allowed" output46.mdig > /dev/null || ret=1 +echo_i "check mdig -4 with an IPv6 server address ($n)" +mdig_with_opts -4 -f input @fd92:7065:b8e:ffff::2 > output.mdig.$n 2>&1 && ret=1 +grep "address family not supported" output.mdig.$n > /dev/null || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi -status=`expr $status + $ret` - -echo_i "check mdig -4 with an IPv6 server address" +status=$((status+ret)) +n=$((n+1)) ret=0 -$MDIG $MDIGOPTS -4 -f input @fd92:7065:b8e:ffff::2 > output4.mdig 2>&1 && ret=1 -grep "address family not supported" output4.mdig > /dev/null || ret=1 -if [ $ret != 0 ]; then echo_i "failed"; fi -status=`expr $status + $ret` echo_i "exit status: $status" [ $status -eq 0 ] || exit 1 diff --git a/bin/tests/system/tcp/ns7/named.conf.in b/bin/tests/system/tcp/ns7/named.conf.in index bf434d9913..fcaeecfe12 100644 --- a/bin/tests/system/tcp/ns7/named.conf.in +++ b/bin/tests/system/tcp/ns7/named.conf.in @@ -23,7 +23,6 @@ options { notify yes; statistics-file "named.stats"; tcp-clients 1; - keep-response-order { any; }; }; key rndc_key {