From: Tom Krizek <tkrizek@isc.org>
Date: Mon, 19 Jun 2023 14:36:05 +0000 (+0200)
Subject: Handle non-zero return codes in rndc test
X-Git-Tag: v9.19.16~45^2~15
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=c50a9e158d12c85f0305e812910274e52930fc38;p=thirdparty%2Fbind9.git

Handle non-zero return codes in rndc test
---

diff --git a/bin/tests/system/rndc/tests.sh b/bin/tests/system/rndc/tests.sh
index 2be9594debf..a968b93d7a8 100644
--- a/bin/tests/system/rndc/tests.sh
+++ b/bin/tests/system/rndc/tests.sh
@@ -207,7 +207,7 @@ status=$((status+ret))
 n=$((n+1))
 echo_i "checking that freezing static zones is not allowed ($n)"
 ret=0
-$RNDCCMD 10.53.0.2 freeze static > rndc.out.1.test$n 2>&1
+$RNDCCMD 10.53.0.2 freeze static > rndc.out.1.test$n 2>&1 && ret=1
 grep 'not dynamic' rndc.out.1.test$n > /dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
@@ -492,7 +492,7 @@ $RNDCCMD4 nta -l 1d nta2.example > rndc.out.2.test$n 2>&1
 grep "Negative trust anchor added" rndc.out.2.test$n > /dev/null || ret=1
 $RNDCCMD4 nta -l 1w nta3.example > rndc.out.3.test$n 2>&1
 grep "Negative trust anchor added" rndc.out.3.test$n > /dev/null || ret=1
-$RNDCCMD4 nta -l 8d nta4.example > rndc.out.4.test$n 2>&1
+$RNDCCMD4 nta -l 8d nta4.example > rndc.out.4.test$n 2>&1 && ret=1
 grep "NTA lifetime cannot exceed one week" rndc.out.4.test$n > /dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
@@ -507,7 +507,7 @@ $RNDCCMD4 nta -c any nta1.example > rndc.out.2.test$n 2>&1
 nextpart ns4/named.run | grep "added NTA 'nta1.example'" > /dev/null || ret=1
 $RNDCCMD4 nta -c ch nta1.example > rndc.out.3.test$n 2>&1
 nextpart ns4/named.run | grep "added NTA 'nta1.example'" > /dev/null && ret=1
-$RNDCCMD4 nta -c fake nta1.example > rndc.out.4.test$n 2>&1
+$RNDCCMD4 nta -c fake nta1.example > rndc.out.4.test$n 2>&1 && ret=1
 nextpart ns4/named.run | grep "added NTA 'nta1.example'" > /dev/null && ret=1
 grep 'unknown class' rndc.out.4.test$n > /dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi