From 7e3c96c867576eb335b566ea5e0fd4b60955e7c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 18 Oct 2017 14:23:35 +0200 Subject: [PATCH] [rt46602] Utilize echo_i to allow mixed test output --- bin/tests/system/allow_query/tests.sh | 174 +++++++++---------- bin/tests/system/serve-stale/tests.sh | 232 +++++++++++++------------- 2 files changed, 203 insertions(+), 203 deletions(-) diff --git a/bin/tests/system/allow_query/tests.sh b/bin/tests/system/allow_query/tests.sh index 29129b12e7..e7029bd274 100644 --- a/bin/tests/system/allow_query/tests.sh +++ b/bin/tests/system/allow_query/tests.sh @@ -61,12 +61,12 @@ n=0 # Test 1 - default, query allowed n=`expr $n + 1` -echo "I:test $n: default - query allowed" +echo_i "test $n: default - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 2 - explicit any, query allowed @@ -75,12 +75,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named02.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: explicit any - query allowed" +echo_i "test $n: explicit any - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 3 - none, query refused @@ -89,12 +89,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named03.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: none - query refused" +echo_i "test $n: none - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 4 - address allowed, query allowed @@ -103,12 +103,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named04.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: address allowed - query allowed" +echo_i "test $n: address allowed - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 5 - address not allowed, query refused @@ -117,12 +117,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named05.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: address not allowed - query refused" +echo_i "test $n: address not allowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 6 - address disallowed, query refused @@ -131,12 +131,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named06.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: address disallowed - query refused" +echo_i "test $n: address disallowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 7 - acl allowed, query allowed @@ -145,12 +145,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named07.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: acl allowed - query allowed" +echo_i "test $n: acl allowed - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 8 - acl not allowed, query refused @@ -159,12 +159,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named08.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: acl not allowed - query refused" +echo_i "test $n: acl not allowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` @@ -174,12 +174,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named09.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: acl disallowed - query refused" +echo_i "test $n: acl disallowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 10 - key allowed, query allowed @@ -188,12 +188,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named10.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: key allowed - query allowed" +echo_i "test $n: key allowed - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y one:1234abcd8765 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 11 - key not allowed, query refused @@ -202,12 +202,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named11.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: key not allowed - query refused" +echo_i "test $n: key not allowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y two:1234efgh8765 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 12 - key disallowed, query refused @@ -216,12 +216,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named12.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: key disallowed - query refused" +echo_i "test $n: key disallowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y one:1234abcd8765 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # The next set of tests check if allow-query works in a view @@ -233,12 +233,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named21.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: views default - query allowed" +echo_i "test $n: views default - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 22 - views explicit any, query allowed @@ -247,12 +247,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named22.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: views explicit any - query allowed" +echo_i "test $n: views explicit any - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 23 - views none, query refused @@ -261,12 +261,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named23.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: views none - query refused" +echo_i "test $n: views none - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 24 - views address allowed, query allowed @@ -275,12 +275,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named24.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: views address allowed - query allowed" +echo_i "test $n: views address allowed - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 25 - views address not allowed, query refused @@ -289,12 +289,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named25.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: views address not allowed - query refused" +echo_i "test $n: views address not allowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 26 - views address disallowed, query refused @@ -303,12 +303,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named26.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: views address disallowed - query refused" +echo_i "test $n: views address disallowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 27 - views acl allowed, query allowed @@ -317,12 +317,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named27.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: views acl allowed - query allowed" +echo_i "test $n: views acl allowed - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 28 - views acl not allowed, query refused @@ -331,12 +331,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named28.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: views acl not allowed - query refused" +echo_i "test $n: views acl not allowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 29 - views acl disallowed, query refused @@ -345,12 +345,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named29.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: views acl disallowed - query refused" +echo_i "test $n: views acl disallowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 30 - views key allowed, query allowed @@ -359,12 +359,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named30.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: views key allowed - query allowed" +echo_i "test $n: views key allowed - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y one:1234abcd8765 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 31 - views key not allowed, query refused @@ -373,12 +373,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named31.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: views key not allowed - query refused" +echo_i "test $n: views key not allowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y two:1234efgh8765 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 32 - views key disallowed, query refused @@ -387,12 +387,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named32.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: views key disallowed - query refused" +echo_i "test $n: views key disallowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y one:1234abcd8765 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 33 - views over options, views allow, query allowed @@ -401,12 +401,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named33.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: views over options, views allow - query allowed" +echo_i "test $n: views over options, views allow - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 34 - views over options, views disallow, query refused @@ -415,12 +415,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named34.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: views over options, views disallow - query refused" +echo_i "test $n: views over options, views disallow - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Tests for allow-query in the zone statements @@ -433,122 +433,122 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named40.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: zone default - query allowed" +echo_i "test $n: zone default - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 42 - zone explicit any, query allowed n=`expr $n + 1` -echo "I:test $n: zone explicit any - query allowed" +echo_i "test $n: zone explicit any - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.any.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.any.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 43 - zone none, query refused n=`expr $n + 1` -echo "I:test $n: zone none - query refused" +echo_i "test $n: zone none - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.none.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.none.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 44 - zone address allowed, query allowed n=`expr $n + 1` -echo "I:test $n: zone address allowed - query allowed" +echo_i "test $n: zone address allowed - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.addrallow.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.addrallow.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 45 - zone address not allowed, query refused n=`expr $n + 1` -echo "I:test $n: zone address not allowed - query refused" +echo_i "test $n: zone address not allowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.addrnotallow.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.addrnotallow.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 46 - zone address disallowed, query refused n=`expr $n + 1` -echo "I:test $n: zone address disallowed - query refused" +echo_i "test $n: zone address disallowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.addrdisallow.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.addrdisallow.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 47 - zone acl allowed, query allowed n=`expr $n + 1` -echo "I:test $n: zone acl allowed - query allowed" +echo_i "test $n: zone acl allowed - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.aclallow.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.aclallow.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 48 - zone acl not allowed, query refused n=`expr $n + 1` -echo "I:test $n: zone acl not allowed - query refused" +echo_i "test $n: zone acl not allowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.aclnotallow.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.aclnotallow.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 49 - zone acl disallowed, query refused n=`expr $n + 1` -echo "I:test $n: zone acl disallowed - query refused" +echo_i "test $n: zone acl disallowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.acldisallow.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.acldisallow.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 50 - zone key allowed, query allowed n=`expr $n + 1` -echo "I:test $n: zone key allowed - query allowed" +echo_i "test $n: zone key allowed - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y one:1234abcd8765 a.keyallow.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.keyallow.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 51 - zone key not allowed, query refused n=`expr $n + 1` -echo "I:test $n: zone key not allowed - query refused" +echo_i "test $n: zone key not allowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y two:1234efgh8765 a.keyallow.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.keyallow.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 52 - zone key disallowed, query refused n=`expr $n + 1` -echo "I:test $n: zone key disallowed - query refused" +echo_i "test $n: zone key disallowed - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 -y one:1234abcd8765 a.keydisallow.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.keydisallow.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 53 - zones over options, zones allow, query allowed @@ -557,12 +557,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named53.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: views over options, views allow - query allowed" +echo_i "test $n: views over options, views allow - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 54 - zones over options, zones disallow, query refused @@ -571,12 +571,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named54.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: views over options, views disallow - query refused" +echo_i "test $n: views over options, views disallow - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 55 - zones over views, zones allow, query allowed @@ -585,12 +585,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named55.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: zones over views, views allow - query allowed" +echo_i "test $n: zones over views, views allow - query allowed" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 56 - zones over views, zones disallow, query refused @@ -599,12 +599,12 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named56.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: zones over views, views disallow - query refused" +echo_i "test $n: zones over views, views disallow - query refused" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.$n > /dev/null || ret=1 grep '^a.normal.example' dig.out.ns2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` # Test 57 - zones over views, zones disallow, query refused (allow-query-on) @@ -613,7 +613,7 @@ sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named57.conf $RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /' sleep 5 -echo "I:test $n: zones over views, allow-query-on" +echo_i "test $n: zones over views, allow-query-on" ret=0 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.normal.example a > dig.out.ns2.1.$n || ret=1 grep 'status: NOERROR' dig.out.ns2.1.$n > /dev/null || ret=1 @@ -621,8 +621,8 @@ grep '^a.normal.example' dig.out.ns2.1.$n > /dev/null || ret=1 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.aclnotallow.example a > dig.out.ns2.2.$n || ret=1 grep 'status: REFUSED' dig.out.ns2.2.$n > /dev/null || ret=1 grep '^a.aclnotallow.example' dig.out.ns2.2.$n > /dev/null && ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -echo "I:exit status: $status" +echo_i "exit status: $status" [ $status -eq 0 ] || exit 1 diff --git a/bin/tests/system/serve-stale/tests.sh b/bin/tests/system/serve-stale/tests.sh index 18cb11b69f..25b8041cb5 100755 --- a/bin/tests/system/serve-stale/tests.sh +++ b/bin/tests/system/serve-stale/tests.sh @@ -11,6 +11,8 @@ SYSTEMTESTTOP=.. . ../getopts.sh +TESTNAME="$(basename $(pwd))" + while getopts "p:c:" flag; do case "$flag" in p) port=$OPTARG ;; @@ -21,12 +23,10 @@ done RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${controlport} -s" -echo "RNDCCMD: ${RNDCCMD}" - status=0 n=0 -#echo "I:check ans.pl server ($n)" +#echo_i "check ans.pl server ($n)" #$DIG -p ${port} @10.53.0.2 example NS #$DIG -p ${port} @10.53.0.2 example SOA #$DIG -p ${port} @10.53.0.2 ns.example A @@ -41,470 +41,470 @@ n=0 #$DIG -p ${port} @10.53.0.2 nxdomain.example TXT n=`expr $n + 1` -echo "I:prime cache data.example ($n)" +echo_i "prime cache data.example ($n)" ret=0 $DIG -p ${port} @10.53.0.1 data.example TXT > dig.out.test$n grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:prime cache nodata.example ($n)" +echo_i "prime cache nodata.example ($n)" ret=0 $DIG -p ${port} @10.53.0.1 nodata.example TXT > dig.out.test$n grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:prime cache nxdomain.example ($n)" +echo_i "prime cache nxdomain.example ($n)" ret=0 $DIG -p ${port} @10.53.0.1 nxdomain.example TXT > dig.out.test$n grep "status: NXDOMAIN" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:disable responses from authoritative server ($n)" +echo_i "disable responses from authoritative server ($n)" ret=0 $DIG -p ${port} @10.53.0.2 txt disable > dig.out.test$n grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1 grep "TXT.\"0\"" dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` sleep 1 n=`expr $n + 1` -echo "I:check 'rndc serve-stale status' ($n)" +echo_i "check 'rndc serve-stale status' ($n)" ret=0 $RNDCCMD 10.53.0.1 serve-stale status > rndc.out.test$n 2>&1 || ret=1 grep '_default: on (stale-answer-ttl=1 max-stale-ttl=3600)' rndc.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale data.example ($n)" +echo_i "check stale data.example ($n)" ret=0 $DIG -p ${port} @10.53.0.1 data.example TXT > dig.out.test$n grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale nodata.example ($n)" +echo_i "check stale nodata.example ($n)" ret=0 $DIG -p ${port} @10.53.0.1 nodata.example TXT > dig.out.test$n grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale nxdomain.example ($n)" +echo_i "check stale nxdomain.example ($n)" ret=0 $DIG -p ${port} @10.53.0.1 nxdomain.example TXT > dig.out.test$n grep "status: NXDOMAIN" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:running 'rndc serve-stale off' ($n)" +echo_i "running 'rndc serve-stale off' ($n)" ret=0 $RNDCCMD 10.53.0.1 serve-stale off || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check 'rndc serve-stale status' ($n)" +echo_i "check 'rndc serve-stale status' ($n)" ret=0 $RNDCCMD 10.53.0.1 serve-stale status > rndc.out.test$n 2>&1 || ret=1 grep '_default: off (rndc) (stale-answer-ttl=1 max-stale-ttl=3600)' rndc.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale data.example (serve-stale off) ($n)" +echo_i "check stale data.example (serve-stale off) ($n)" ret=0 $DIG -p ${port} @10.53.0.1 data.example TXT > dig.out.test$n grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale nodata.example (serve-stale off) ($n)" +echo_i "check stale nodata.example (serve-stale off) ($n)" ret=0 $DIG -p ${port} @10.53.0.1 nodata.example TXT > dig.out.test$n grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale nxdomain.example (serve-stale off) ($n)" +echo_i "check stale nxdomain.example (serve-stale off) ($n)" ret=0 $DIG -p ${port} @10.53.0.1 nxdomain.example TXT > dig.out.test$n grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:running 'rndc serve-stale on' ($n)" +echo_i "running 'rndc serve-stale on' ($n)" ret=0 $RNDCCMD 10.53.0.1 serve-stale on || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check 'rndc serve-stale status' ($n)" +echo_i "check 'rndc serve-stale status' ($n)" ret=0 $RNDCCMD 10.53.0.1 serve-stale status > rndc.out.test$n 2>&1 || ret=1 grep '_default: on (rndc) (stale-answer-ttl=1 max-stale-ttl=3600)' rndc.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale data.example (serve-stale on) ($n)" +echo_i "check stale data.example (serve-stale on) ($n)" ret=0 $DIG -p ${port} @10.53.0.1 data.example TXT > dig.out.test$n grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale nodata.example (serve-stale on) ($n)" +echo_i "check stale nodata.example (serve-stale on) ($n)" ret=0 $DIG -p ${port} @10.53.0.1 nodata.example TXT > dig.out.test$n grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale nxdomain.example (serve-stale on) ($n)" +echo_i "check stale nxdomain.example (serve-stale on) ($n)" ret=0 $DIG -p ${port} @10.53.0.1 nxdomain.example TXT > dig.out.test$n grep "status: NXDOMAIN" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:running 'rndc serve-stale no' ($n)" +echo_i "running 'rndc serve-stale no' ($n)" ret=0 $RNDCCMD 10.53.0.1 serve-stale no || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check 'rndc serve-stale status' ($n)" +echo_i "check 'rndc serve-stale status' ($n)" ret=0 $RNDCCMD 10.53.0.1 serve-stale status > rndc.out.test$n 2>&1 || ret=1 grep '_default: off (rndc) (stale-answer-ttl=1 max-stale-ttl=3600)' rndc.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale data.example (serve-stale no) ($n)" +echo_i "check stale data.example (serve-stale no) ($n)" ret=0 $DIG -p ${port} @10.53.0.1 data.example TXT > dig.out.test$n grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale nodata.example (serve-stale no) ($n)" +echo_i "check stale nodata.example (serve-stale no) ($n)" ret=0 $DIG -p ${port} @10.53.0.1 nodata.example TXT > dig.out.test$n grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale nxdomain.example (serve-stale no) ($n)" +echo_i "check stale nxdomain.example (serve-stale no) ($n)" ret=0 $DIG -p ${port} @10.53.0.1 nxdomain.example TXT > dig.out.test$n grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:running 'rndc serve-stale yes' ($n)" +echo_i "running 'rndc serve-stale yes' ($n)" ret=0 $RNDCCMD 10.53.0.1 serve-stale yes || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check 'rndc serve-stale status' ($n)" +echo_i "check 'rndc serve-stale status' ($n)" ret=0 $RNDCCMD 10.53.0.1 serve-stale status > rndc.out.test$n 2>&1 || ret=1 grep '_default: on (rndc) (stale-answer-ttl=1 max-stale-ttl=3600)' rndc.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale data.example (serve-stale yes) ($n)" +echo_i "check stale data.example (serve-stale yes) ($n)" ret=0 $DIG -p ${port} @10.53.0.1 data.example TXT > dig.out.test$n grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale nodata.example (serve-stale yes) ($n)" +echo_i "check stale nodata.example (serve-stale yes) ($n)" ret=0 $DIG -p ${port} @10.53.0.1 nodata.example TXT > dig.out.test$n grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale nxdomain.example (serve-stale yes) ($n)" +echo_i "check stale nxdomain.example (serve-stale yes) ($n)" ret=0 $DIG -p ${port} @10.53.0.1 nxdomain.example TXT > dig.out.test$n grep "status: NXDOMAIN" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:running 'rndc serve-stale off' ($n)" +echo_i "running 'rndc serve-stale off' ($n)" ret=0 $RNDCCMD 10.53.0.1 serve-stale off || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:running 'rndc serve-stale reset' ($n)" +echo_i "running 'rndc serve-stale reset' ($n)" ret=0 $RNDCCMD 10.53.0.1 serve-stale reset || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check 'rndc serve-stale status' ($n)" +echo_i "check 'rndc serve-stale status' ($n)" ret=0 $RNDCCMD 10.53.0.1 serve-stale status > rndc.out.test$n 2>&1 || ret=1 grep '_default: on (stale-answer-ttl=1 max-stale-ttl=3600)' rndc.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale data.example (serve-stale reset) ($n)" +echo_i "check stale data.example (serve-stale reset) ($n)" ret=0 $DIG -p ${port} @10.53.0.1 data.example TXT > dig.out.test$n grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale nodata.example (serve-stale reset) ($n)" +echo_i "check stale nodata.example (serve-stale reset) ($n)" ret=0 $DIG -p ${port} @10.53.0.1 nodata.example TXT > dig.out.test$n grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check stale nxdomain.example (serve-stale reset) ($n)" +echo_i "check stale nxdomain.example (serve-stale reset) ($n)" ret=0 $DIG -p ${port} @10.53.0.1 nxdomain.example TXT > dig.out.test$n grep "status: NXDOMAIN" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:running 'rndc serve-stale off' ($n)" +echo_i "running 'rndc serve-stale off' ($n)" ret=0 $RNDCCMD 10.53.0.1 serve-stale off || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check 'rndc serve-stale status' ($n)" +echo_i "check 'rndc serve-stale status' ($n)" ret=0 $RNDCCMD 10.53.0.1 serve-stale status > rndc.out.test$n 2>&1 || ret=1 grep '_default: off (rndc) (stale-answer-ttl=1 max-stale-ttl=3600)' rndc.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:updating ns1/named.conf ($n)" +echo_i "updating ns1/named.conf ($n)" ret=0 sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g" < ns1/named2.conf.in > ns1/named.conf -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:running 'rndc reload' ($n)" +echo_i "running 'rndc reload' ($n)" ret=0 $RNDCCMD 10.53.0.1 reload > rndc.out.test$n 2>&1 || ret=1 grep "server reload successful" rndc.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check 'rndc serve-stale status' ($n)" +echo_i "check 'rndc serve-stale status' ($n)" ret=0 $RNDCCMD 10.53.0.1 serve-stale status > rndc.out.test$n 2>&1 || ret=1 grep '_default: off (rndc) (stale-answer-ttl=2 max-stale-ttl=7200)' rndc.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check 'rndc serve-stale' ($n)" +echo_i "check 'rndc serve-stale' ($n)" ret=0 $RNDCCMD 10.53.0.1 serve-stale > rndc.out.test$n 2>&1 && ret=1 grep "unexpected end of input" rndc.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check 'rndc serve-stale unknown' ($n)" +echo_i "check 'rndc serve-stale unknown' ($n)" ret=0 $RNDCCMD 10.53.0.1 serve-stale unknown > rndc.out.test$n 2>&1 && ret=1 grep "syntax error" rndc.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:enable responses from authoritative server ($n)" +echo_i "enable responses from authoritative server ($n)" ret=0 $DIG -p ${port} @10.53.0.2 txt enable > dig.out.test$n grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1 grep "TXT.\"1\"" dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:prime cache data.example (max-stale-ttl default) ($n)" +echo_i "prime cache data.example (max-stale-ttl default) ($n)" ret=0 $DIG -p ${port} @10.53.0.3 data.example TXT > dig.out.test$n grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:prime cache nodata.example (max-stale-ttl default) ($n)" +echo_i "prime cache nodata.example (max-stale-ttl default) ($n)" ret=0 $DIG -p ${port} @10.53.0.3 nodata.example TXT > dig.out.test$n grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:prime cache nxdomain.example (max-stale-ttl default) ($n)" +echo_i "prime cache nxdomain.example (max-stale-ttl default) ($n)" ret=0 $DIG -p ${port} @10.53.0.3 nxdomain.example TXT > dig.out.test$n grep "status: NXDOMAIN" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:disable responses from authoritative server ($n)" +echo_i "disable responses from authoritative server ($n)" ret=0 $DIG -p ${port} @10.53.0.2 txt disable > dig.out.test$n grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1 grep "TXT.\"0\"" dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` sleep 1 n=`expr $n + 1` -echo "I:check 'rndc serve-stale status' ($n)" +echo_i "check 'rndc serve-stale status' ($n)" ret=0 $RNDCCMD 10.53.0.3 serve-stale status > rndc.out.test$n 2>&1 || ret=1 grep '_default: off (stale-answer-ttl=1 max-stale-ttl=604800)' rndc.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check fail of data.example (max-stale-ttl default) ($n)" +echo_i "check fail of data.example (max-stale-ttl default) ($n)" ret=0 $DIG -p ${port} @10.53.0.3 data.example TXT > dig.out.test$n grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check fail of nodata.example (max-stale-ttl default) ($n)" +echo_i "check fail of nodata.example (max-stale-ttl default) ($n)" ret=0 $DIG -p ${port} @10.53.0.3 nodata.example TXT > dig.out.test$n grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check fail of nxdomain.example (max-stale-ttl default) ($n)" +echo_i "check fail of nxdomain.example (max-stale-ttl default) ($n)" ret=0 $DIG -p ${port} @10.53.0.3 nxdomain.example TXT > dig.out.test$n grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check 'rndc serve-stale on' ($n)" +echo_i "check 'rndc serve-stale on' ($n)" ret=0 $RNDCCMD 10.53.0.3 serve-stale on > rndc.out.test$n 2>&1 || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check 'rndc serve-stale status' ($n)" +echo_i "check 'rndc serve-stale status' ($n)" ret=0 $RNDCCMD 10.53.0.3 serve-stale status > rndc.out.test$n 2>&1 || ret=1 grep '_default: on (rndc) (stale-answer-ttl=1 max-stale-ttl=604800)' rndc.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check data.example (max-stale-ttl default) ($n)" +echo_i "check data.example (max-stale-ttl default) ($n)" ret=0 $DIG -p ${port} @10.53.0.3 data.example TXT > dig.out.test$n grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 1," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check nodata.example (max-stale-ttl default) ($n)" +echo_i "check nodata.example (max-stale-ttl default) ($n)" ret=0 $DIG -p ${port} @10.53.0.3 nodata.example TXT > dig.out.test$n grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I:check nxdomain.example (max-stale-ttl default) ($n)" +echo_i "check nxdomain.example (max-stale-ttl default) ($n)" ret=0 $DIG -p ${port} @10.53.0.3 nxdomain.example TXT > dig.out.test$n grep "status: NXDOMAIN" dig.out.test$n > /dev/null || ret=1 grep "ANSWER: 0," dig.out.test$n > /dev/null || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi +if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -echo "I:exit status: $status" +echo_i "exit status: $status" [ $status -eq 0 ] || exit 1