From 9e8c23be7ee8e920347710dccd9dbe35cceb8536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Tue, 13 Dec 2022 15:20:10 +0100 Subject: [PATCH] Revert the statistics system test change after we fixed the resolver When the resolver was refactored, the statistics system test had to be adjusted in c6b4d8255775a24a12b832a90a78cbf86e9faa8d. Unfortunately, this change had to be done because of an error in the resolver refactoring where timeout would not retry next server, but keep trying the same server. As we have now fixed this bug, revert the change to the test back to the previous state. (cherry picked from commit b6796409504cfa0a52f1850a2b0bf15c56c94cf7) --- bin/tests/system/statistics/tests.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bin/tests/system/statistics/tests.sh b/bin/tests/system/statistics/tests.sh index d21b4622b7..a7af610115 100644 --- a/bin/tests/system/statistics/tests.sh +++ b/bin/tests/system/statistics/tests.sh @@ -139,13 +139,11 @@ n=`expr $n + 1` ret=0 echo_i "checking priming queries are counted ($n)" -grep "1 priming queries" $last_stats > /dev/null || ret=1 +grep "priming queries" $last_stats > /dev/null || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -wait_for_log 10 "connection refused" ns3/named.stats - ret=0 echo_i "checking that zones with slash are properly shown in XML output ($n)" if $FEATURETEST --have-libxml2 && [ -x ${CURL} ] ; then @@ -234,7 +232,7 @@ if $FEATURETEST --have-libxml2 && [ -e stats.xml.out ] && [ -x "${XSLTPROC}" ] # Socket statistics (expect no errors) grep "0" stats.xml.out >/dev/null || ret=1 grep "0" stats.xml.out >/dev/null || ret=1 - grep "1" stats.xml.out >/dev/null || ret=1 + grep "0" stats.xml.out >/dev/null || ret=1 grep "0" stats.xml.out >/dev/null || ret=1 grep "0" stats.xml.out >/dev/null || ret=1 # grep "0" stats.xml.out >/dev/null || ret=1