From: Tom Krizek <tkrizek@isc.org>
Date: Fri, 5 Jan 2024 14:08:44 +0000 (+0100)
Subject: Handle dig timing out gracefully in masterfile
X-Git-Tag: v9.19.22~94^2~9
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=0bf25138b674aa802ccdde2671072e2241ad856f;p=thirdparty%2Fbind9.git

Handle dig timing out gracefully in masterfile
---

diff --git a/bin/tests/system/masterfile/tests.sh b/bin/tests/system/masterfile/tests.sh
index b62537659b5..d15599d36a8 100644
--- a/bin/tests/system/masterfile/tests.sh
+++ b/bin/tests/system/masterfile/tests.sh
@@ -23,13 +23,13 @@ n=0
 ret=0
 n=$((n + 1))
 echo_i "test master file \$INCLUDE semantics ($n)"
-$DIG $DIGOPTS +nostats +nocmd include. axfr @10.53.0.1 >dig.out.$n
+$DIG $DIGOPTS +nostats +nocmd include. axfr @10.53.0.1 >dig.out.$n || ret=1
 
 echo_i "test master file BIND 8 compatibility TTL and \$TTL semantics ($n)"
-$DIG $DIGOPTS +nostats +nocmd ttl2. axfr @10.53.0.1 >>dig.out.$n
+$DIG $DIGOPTS +nostats +nocmd ttl2. axfr @10.53.0.1 >>dig.out.$n || ret=1
 
 echo_i "test of master file RFC1035 TTL and \$TTL semantics ($n)"
-$DIG $DIGOPTS +nostats +nocmd ttl2. axfr @10.53.0.1 >>dig.out.$n
+$DIG $DIGOPTS +nostats +nocmd ttl2. axfr @10.53.0.1 >>dig.out.$n || ret=1
 
 diff dig.out.$n knowngood.dig.out || status=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
@@ -38,7 +38,7 @@ status=$((status + ret))
 ret=0
 n=$((n + 1))
 echo_i "test that the nameserver is running with a missing master file ($n)"
-$DIG $DIGOPTS +tcp +noall +answer example soa @10.53.0.2 >dig.out.$n
+$DIG $DIGOPTS +tcp +noall +answer example soa @10.53.0.2 >dig.out.$n || ret=1
 grep SOA dig.out.$n >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
@@ -46,7 +46,7 @@ status=$((status + ret))
 ret=0
 n=$((n + 1))
 echo_i "test that the nameserver returns SERVFAIL for a missing master file ($n)"
-$DIG $DIGOPTS +tcp +all missing soa @10.53.0.2 >dig.out.$n
+$DIG $DIGOPTS +tcp +all missing soa @10.53.0.2 >dig.out.$n || ret=1
 grep "status: SERVFAIL" dig.out.$n >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))