From: Michał Kępień <michal@isc.org>
Date: Thu, 7 Nov 2019 11:25:39 +0000 (+0100)
Subject: Ensure all "tcp" system test errors are caught
X-Git-Tag: v9.15.6~22^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46df363a0d04d1097ceb75b5380ec67510d5ccc9;p=thirdparty%2Fbind9.git

Ensure all "tcp" system test errors are caught

Ensure any "rndc stats" failure causes the "tcp" system test to fail.
Do not hide "rndc stats" output.
---

diff --git a/bin/tests/system/tcp/tests.sh b/bin/tests/system/tcp/tests.sh
index ed562beffe5..2d309c2bc4b 100644
--- a/bin/tests/system/tcp/tests.sh
+++ b/bin/tests/system/tcp/tests.sh
@@ -22,20 +22,22 @@ n=0
 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
+$RNDCCMD -s 10.53.0.1 stats || ret=1
+$RNDCCMD -s 10.53.0.2 stats || ret=1
 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}'`
+if [ $ret != 0 ]; then echo_i "failed"; fi
+status=`expr $status + $ret`
 
 n=$((n + 1))
 echo_i "checking TCP request statistics (resolver) ($n)"
 ret=0
 $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
+$RNDCCMD -s 10.53.0.1 stats || ret=1
+$RNDCCMD -s 10.53.0.2 stats || ret=1
 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}'`
@@ -50,8 +52,8 @@ echo_i "checking TCP request statistics (forwarder) ($n)"
 ret=0
 $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
+$RNDCCMD -s 10.53.0.1 stats || ret=1
+$RNDCCMD -s 10.53.0.2 stats || ret=1
 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}'`