From 2c21a771392f8014b779b7fc67e2d1b83e3fd81c Mon Sep 17 00:00:00 2001 From: Tom Krizek Date: Fri, 5 Jan 2024 15:08:44 +0100 Subject: [PATCH] Handle dig timing out gracefully in masterfile (cherry picked from commit 0bf25138b674aa802ccdde2671072e2241ad856f) --- bin/tests/system/masterfile/tests.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/tests/system/masterfile/tests.sh b/bin/tests/system/masterfile/tests.sh index 07af15c909..2502691ff8 100644 --- a/bin/tests/system/masterfile/tests.sh +++ b/bin/tests/system/masterfile/tests.sh @@ -22,13 +22,13 @@ n=0 ret=0 n=$(expr $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 @@ -37,7 +37,7 @@ status=$(expr $status + $ret) ret=0 n=$(expr $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=$(expr $status + $ret) @@ -45,7 +45,7 @@ status=$(expr $status + $ret) ret=0 n=$(expr $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=$(expr $status + $ret)