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.

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 (file)
index a3685d7..0000000
--- 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 897dc864d6ad126ce21eae5d3f1eb4ef9e6e4add..100ec3a827f19aca8fffbde932b96f23b5478ec2 100644 (file)
--- 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 12c17337d0dd96a0ae020f508f34acdb374d8763..7ec0aad06b65fcac4128ac96f91a684b6eed9c44 100644 (file)
--- 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 34a105f5f7ac8c71cddb84aa6c062220e57b8eaa..df89da1b074f5d4dfff18e992db44f4e58ddf6a2 100644 (file)
--- 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}" "${@}"
+}
 
-status=0
+rndccmd() {
+       "$RNDC" -c ../common/rndc.conf -p "${CONTROLPORT}" -s "${@}"
+}
 
-echo_i "check pipelined TCP queries"
-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`
+pipequeries() {
+       "$PIPEQUERIES" -p "${PORT}"
+}
 
-echo_i "check pipelined TCP queries using mdig"
+status=0
+n=1
 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"; }
-if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
 
-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 ($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`
-
-echo_i "check keep-response-order using mdig"
+status=$((status+ret))
+n=$((n+1))
 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
-if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
 
-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 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 mdig -4 with an IPv6 server address"
+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=$((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
+
+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`
+status=$((status+ret))
+n=$((n+1))
+ret=0
 
 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 bf434d9913cbf859c1a16d17d83df6d8df8fb2a7..fcaeecfe120be13fe457af824fe1f6b1bc575a85 100644 (file)
--- 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 {