From: Michał Kępień Date: Wed, 29 May 2019 09:05:01 +0000 (+0200) Subject: Properly test servers with TCP support disabled X-Git-Tag: v9.15.1~32^2~8 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=9491616e5cd412e30cd2802d963a3f024af9399e;p=thirdparty%2Fbind9.git Properly test servers with TCP support disabled Sending TCP queries to test named instances with TCP support disabled should cause dig output to contain the phrase "connection refused", not "connection timed out", as such instances never open the relevant sockets. Make sure that the "legacy" system test fails if the expected phrase is not found in any of the relevant files containing dig output. --- diff --git a/bin/tests/system/legacy/tests.sh b/bin/tests/system/legacy/tests.sh index effc2366283..97ed960c0bc 100755 --- a/bin/tests/system/legacy/tests.sh +++ b/bin/tests/system/legacy/tests.sh @@ -101,7 +101,7 @@ ret=0 $DIG $DIGOPTS +edns @10.53.0.3 dropedns-notcp soa > dig.out.1.test$n grep "connection timed out; no servers could be reached" dig.out.1.test$n > /dev/null || ret=1 $DIG $DIGOPTS +noedns +tcp @10.53.0.3 dropedns-notcp soa > dig.out.2.test$n -grep "connection timed out; no servers could be reached" dig.out.2.test$n > /dev/null +grep "connection refused" dig.out.2.test$n > /dev/null || ret=1 $DIG $DIGOPTS +noedns @10.53.0.3 dropedns-notcp soa > dig.out.3.test$n || ret=1 grep "status: NOERROR" dig.out.3.test$n > /dev/null || ret=1 grep "EDNS: version:" dig.out.3.test$n > /dev/null && ret=1 @@ -140,7 +140,7 @@ $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 -grep "connection timed out; no servers could be reached" dig.out.2.test$n > /dev/null +grep "connection refused" dig.out.2.test$n > /dev/null || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` @@ -180,7 +180,7 @@ ret=0 $DIG $DIGOPTS +noedns @10.53.0.7 edns512-notcp soa > dig.out.1.test$n || ret=1 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 timed out; no servers could be reached" dig.out.2.test$n > /dev/null +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 $DIG $DIGOPTS +edns +bufsize=512 +ignor @10.53.0.7 edns512-notcp soa > dig.out.4.test$n