From: Michał Kępień <michal@isc.org>
Date: Wed, 29 May 2019 09:05:01 +0000 (+0200)
Subject: Ensure queries expected to time out really do
X-Git-Tag: v9.15.1~32^2~7
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=6283c1cc7e8d0dd0b841d9c533849a63bd8dcbe7;p=thirdparty%2Fbind9.git

Ensure queries expected to time out really do

Make sure that the "legacy" system test fails if queries which are
expected to time out do not really time out.
---

diff --git a/bin/tests/system/legacy/tests.sh b/bin/tests/system/legacy/tests.sh
index 97ed960c0bc..a8b029ac6f6 100755
--- a/bin/tests/system/legacy/tests.sh
+++ b/bin/tests/system/legacy/tests.sh
@@ -160,7 +160,7 @@ grep "status: NOERROR" dig.out.1.test$n > /dev/null || ret=1
 $DIG $DIGOPTS +edns +tcp @10.53.0.6 edns512 soa > dig.out.2.test$n || ret=1
 grep "status: NOERROR" dig.out.1.test$n > /dev/null || ret=1
 $DIG $DIGOPTS +edns @10.53.0.6 txt500.edns512 txt > dig.out.3.test$n
-grep "connection timed out; no servers could be reached" dig.out.3.test$n > /dev/null
+grep "connection timed out; no servers could be reached" dig.out.3.test$n > /dev/null || ret=1
 $DIG $DIGOPTS +edns +bufsize=512 +ignor @10.53.0.6 txt500.edns512 txt > dig.out.4.test$n
 grep "status: NOERROR" dig.out.4.test$n > /dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
@@ -182,7 +182,7 @@ grep "status: NOERROR" dig.out.1.test$n > /dev/null || ret=1
 $DIG $DIGOPTS +noedns +tcp @10.53.0.7 edns512-notcp soa > dig.out.2.test$n
 grep "connection refused" dig.out.2.test$n > /dev/null || ret=1
 $DIG $DIGOPTS +edns @10.53.0.7 edns512-notcp soa > dig.out.3.test$n
-grep "connection timed out; no servers could be reached" dig.out.3.test$n > /dev/null
+grep "connection timed out; no servers could be reached" dig.out.3.test$n > /dev/null || ret=1
 $DIG $DIGOPTS +edns +bufsize=512 +ignor @10.53.0.7 edns512-notcp soa > dig.out.4.test$n
 grep "status: NOERROR" dig.out.4.test$n > /dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi