Handle dig timing out gracefully in legacy

(cherry picked from commit 2cc90a815e60198e59aa5ba290a79cd433d2cd72)

diff --git a/bin/tests/system/legacy/tests.sh b/bin/tests/system/legacy/tests.sh
index 7cae407d0af301c69cb0853b2ce25b38c80b24a4..3a9e4caa674c06a531f7c64af300e67e9d1fcf37 100755 (executable)
--- a/bin/tests/system/legacy/tests.sh
+++ b/bin/tests/system/legacy/tests.sh
@@ -33,7 +33,7 @@ resolution_succeeds() {
 resolution_fails() {
   _servfail=0
   _timeout=0
-  $DIG $DIGOPTS +tcp +time=5 @10.53.0.1 ${1} SOA >dig.out.test$n
+  $DIG $DIGOPTS +tcp +time=5 @10.53.0.1 ${1} SOA >dig.out.test$n || true
   grep "status: SERVFAIL" dig.out.test$n >/dev/null && _servfail=1
   grep "connection timed out" dig.out.test$n >/dev/null && _timeout=1
   if [ $_servfail -eq 1 ] || [ $_timeout -eq 1 ]; then
@@ -152,7 +152,7 @@ ret=0
 $DIG $DIGOPTS +edns @10.53.0.4 plain soa >dig.out.1.test$n || ret=1
 grep "status: NOERROR" dig.out.1.test$n >/dev/null || ret=1
 grep "EDNS: version:" dig.out.1.test$n >/dev/null && ret=1
-$DIG $DIGOPTS +edns +tcp @10.53.0.4 plain soa >dig.out.2.test$n
+$DIG $DIGOPTS +edns +tcp @10.53.0.4 plain soa >dig.out.2.test$n || ret=1
 grep "status: NOERROR" dig.out.2.test$n >/dev/null || ret=1
 grep "EDNS: version:" dig.out.2.test$n >/dev/null && ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
@@ -171,7 +171,7 @@ ret=0
 $DIG $DIGOPTS +edns @10.53.0.5 plain-notcp soa >dig.out.1.test$n || ret=1
 grep "status: NOERROR" dig.out.1.test$n >/dev/null || ret=1
 grep "EDNS: version:" dig.out.1.test$n >/dev/null && ret=1
-$DIG $DIGOPTS +edns +tcp @10.53.0.5 plain-notcp soa >dig.out.2.test$n
+$DIG $DIGOPTS +edns +tcp @10.53.0.5 plain-notcp soa >dig.out.2.test$n && ret=1
 grep "connection refused" dig.out.2.test$n >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$(expr $status + $ret)