From f1556f8c4126eced7cf71de3dfc007dbd9940c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 23 Sep 2020 16:36:44 +0200 Subject: [PATCH] Adjust legacy and digdelv tests for default 1232 EDNS Buffer Size * the legacy test with -T maxudp512 will just fail, e.g. if the packets larger than 512 octets are dropped along the path, the proper response is to fail * digdelv test was just expecting default server EDNS buffer size to be 4096, the test needed only slight adjustment --- bin/tests/system/digdelv/tests.sh | 6 ++++-- bin/tests/system/legacy/tests.sh | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh index ebe77a9508..99b80992f2 100644 --- a/bin/tests/system/digdelv/tests.sh +++ b/bin/tests/system/digdelv/tests.sh @@ -958,8 +958,10 @@ if [ -x "$DIG" ] ; then echo_i "check that dig +bufsize restores default bufsize ($n)" ret=0 dig_with_opts @10.53.0.3 a.example +bufsize=0 +bufsize +qr > dig.out.test$n 2>&1 || ret=1 - lines=`grep "EDNS:.* udp: 4096" dig.out.test$n | wc -l` - test $lines -eq 2 || ret=1 + lines1232=`grep "EDNS:.* udp: 1232" dig.out.test$n | wc -l` + lines4096=`grep "EDNS:.* udp: 4096" dig.out.test$n | wc -l` + test $lines1232 -eq 1 || ret=1 + test $lines4096 -eq 1 || ret=1 if [ $ret -ne 0 ]; then echo_i "failed"; fi status=$((status+ret)) diff --git a/bin/tests/system/legacy/tests.sh b/bin/tests/system/legacy/tests.sh index 181f0a8ebd..58516cefbc 100755 --- a/bin/tests/system/legacy/tests.sh +++ b/bin/tests/system/legacy/tests.sh @@ -199,9 +199,9 @@ if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo_i "checking recursive lookup to edns 512 server succeeds ($n)" +echo_i "checking recursive lookup to edns 512 server fails ($n)" ret=0 -resolution_succeeds edns512. || ret=1 +resolution_fails edns512. || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret`