Make all "tcp" system test checks numbered

Ensure all checks in the "tcp" system test are numbered, so that
forensic data is preserved in case of any failure.

diff --git a/bin/tests/system/tcp/clean.sh b/bin/tests/system/tcp/clean.sh
index d6cc684d395ee9b45cb8502b3c3b548e3afd546a..2d19764e081e983ca4c68d48b4cd4f186ffd43e0 100644 (file)
--- a/bin/tests/system/tcp/clean.sh
+++ b/bin/tests/system/tcp/clean.sh
@@ -12,7 +12,7 @@
 rm -f */named.memstats
 rm -f */named.run
 rm -f */named.conf
-rm -f */named.stats
+rm -f */named.stats*
 rm -f ans6/ans.run*
 rm -f dig.out*
 rm -f rndc.out*

diff --git a/bin/tests/system/tcp/tests.sh b/bin/tests/system/tcp/tests.sh
index a498a57baeb01702d10838e6335ecddf0190e79b..ed562beffe5558c9b6097a86218786d0f6da6c3a 100644 (file)
--- a/bin/tests/system/tcp/tests.sh
+++ b/bin/tests/system/tcp/tests.sh
@@ -17,48 +17,51 @@ RNDCCMD="$RNDC -p ${CONTROLPORT} -c ../common/rndc.conf"
 SEND="$PERL $SYSTEMTESTTOP/send.pl 10.53.0.6 ${CONTROLPORT}"
 
 status=0
+n=0
 
-echo_i "initialize counters"
+n=$((n + 1))
+echo_i "initializing TCP statistics ($n)"
+ret=0
 $RNDCCMD -s 10.53.0.1 stats > /dev/null 2>&1
 $RNDCCMD -s 10.53.0.2 stats > /dev/null 2>&1
-ntcp10=`grep "TCP requests received" ns1/named.stats | tail -1 | awk '{print $1}'`
-ntcp20=`grep "TCP requests received" ns2/named.stats | tail -1 | awk '{print $1}'`
-#echo ntcp10 ':' "$ntcp10"
-#echo ntcp20 ':' "$ntcp20"
+mv ns1/named.stats ns1/named.stats.test$n
+mv ns2/named.stats ns2/named.stats.test$n
+ntcp10=`grep "TCP requests received" ns1/named.stats.test$n | tail -1 | awk '{print $1}'`
+ntcp20=`grep "TCP requests received" ns2/named.stats.test$n | tail -1 | awk '{print $1}'`
 
-echo_i "check TCP transport"
+n=$((n + 1))
+echo_i "checking TCP request statistics (resolver) ($n)"
 ret=0
-$DIG $DIGOPTS @10.53.0.3 txt.example. > dig.out.3
+$DIG $DIGOPTS @10.53.0.3 txt.example. > dig.out.test$n
 sleep 1
 $RNDCCMD -s 10.53.0.1 stats > /dev/null 2>&1
 $RNDCCMD -s 10.53.0.2 stats > /dev/null 2>&1
-ntcp11=`grep "TCP requests received" ns1/named.stats | tail -1 | awk '{print $1}'`
-ntcp21=`grep "TCP requests received" ns2/named.stats | tail -1 | awk '{print $1}'`
-#echo ntcp11 ':' "$ntcp11"
-#echo ntcp21 ':' "$ntcp21"
+mv ns1/named.stats ns1/named.stats.test$n
+mv ns2/named.stats ns2/named.stats.test$n
+ntcp11=`grep "TCP requests received" ns1/named.stats.test$n | tail -1 | awk '{print $1}'`
+ntcp21=`grep "TCP requests received" ns2/named.stats.test$n | tail -1 | awk '{print $1}'`
 if [ "$ntcp10" -ge "$ntcp11" ]; then ret=1; fi
 if [ "$ntcp20" -ne "$ntcp21" ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-echo_i "check TCP forwarder"
+n=$((n + 1))
+echo_i "checking TCP request statistics (forwarder) ($n)"
 ret=0
-$DIG $DIGOPTS @10.53.0.4 txt.example. > dig.out.4
+$DIG $DIGOPTS @10.53.0.4 txt.example. > dig.out.test$n
 sleep 1
 $RNDCCMD -s 10.53.0.1 stats > /dev/null 2>&1
 $RNDCCMD -s 10.53.0.2 stats > /dev/null 2>&1
-ntcp12=`grep "TCP requests received" ns1/named.stats | tail -1 | awk '{print $1}'`
-ntcp22=`grep "TCP requests received" ns2/named.stats | tail -1 | awk '{print $1}'`
-#echo ntcp12 ':' "$ntcp12"
-#echo ntcp22 ':' "$ntcp22"
+mv ns1/named.stats ns1/named.stats.test$n
+mv ns2/named.stats ns2/named.stats.test$n
+ntcp12=`grep "TCP requests received" ns1/named.stats.test$n | tail -1 | awk '{print $1}'`
+ntcp22=`grep "TCP requests received" ns2/named.stats.test$n | tail -1 | awk '{print $1}'`
 if [ "$ntcp11" -ne "$ntcp12" ]; then ret=1; fi
 if [ "$ntcp21" -ge "$ntcp22" ];then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 # -------- TCP high-water tests ----------
-n=0
-
 refresh_tcp_stats() {
        $RNDCCMD -s 10.53.0.5 status > rndc.out.$n || ret=1
        TCP_CUR="$(sed -n "s/^tcp clients: \([0-9][0-9]*\).*/\1/p" rndc.out.$n)"