2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00

Fix 'checking drop statistics' test

Wait for the desired log message to appear in ns3/named.stats rather
than the creation of the file.
This commit is contained in:
Mark Andrews
2023-02-28 14:24:20 +11:00
parent af47090d99
commit c7ae975ecf
2 changed files with 4 additions and 6 deletions

View File

@@ -12,8 +12,8 @@
# information regarding copyright ownership. # information regarding copyright ownership.
rm -f */named.conf */named.memstats */ans.run */named.recursing */named.run rm -f */named.conf */named.memstats */ans.run */named.recursing */named.run
rm -f dig.out*
rm -f ans4/norespond rm -f ans4/norespond
rm -f ns3/named.stats ns3/named_dump.db
rm -f burst.input.* rm -f burst.input.*
rm -f dig.out*
rm -f ns*/managed-keys.bind* rm -f ns*/managed-keys.bind*
rm -f ns3/named.stats ns3/named.stats.prev ns3/named_dump.db

View File

@@ -183,11 +183,9 @@ status=$((status+ret))
echo_i "checking drop statistics" echo_i "checking drop statistics"
rm -f ns3/named.stats rm -f ns3/named.stats
touch ns3/named.stats
$RNDCCMD stats $RNDCCMD stats
for try in 1 2 3 4 5; do wait_for_log 5 "queries dropped due to recursive client limit" ns3/named.stats || ret=1
[ -f ns3/named.stats ] && break
sleep 1
done
drops=`grep 'queries dropped due to recursive client limit' ns3/named.stats | sed 's/\([0-9][0-9]*\) queries.*/\1/'` drops=`grep 'queries dropped due to recursive client limit' ns3/named.stats | sed 's/\([0-9][0-9]*\) queries.*/\1/'`
[ "${drops:-0}" -ne 0 ] || ret=1 [ "${drops:-0}" -ne 0 ] || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi