Commit a9a47c79 authored by Michał Kępień's avatar Michał Kępień Committed by Evan Hunt
Browse files

Add system tests for IXFR statistics

Ensure IXFR statistics are calculated correctly by dig and named, both
for incoming and outgoing transfers.  Disable EDNS when using dig to
request an IXFR so that the same reference file can be used for testing
statistics calculated by both dig and named (dig uses EDNS by default
when sending transfer requests, which affects the number of bytes
parent a22e24a4
......@@ -9,6 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
rm -f stats.*
rm -f ns1/myftp.db
rm -f ns3/*.jnl ns3/mytest.db ns3/subtest.db
rm -f ns4/*.jnl ns4/*.db
......@@ -19,4 +20,4 @@ rm -f */
rm -f dig.out dig.out1 dig.out2 dig.out3
rm -f ns3/large.db
rm -f ns*/named.lock
rm -f ns*/managed-keys.bind*
rm -f ns*/managed-keys.bind* ns*/*.mkeys
......@@ -307,5 +307,30 @@ if [ ${ret} != 0 ]; then
echo_i "checking whether dig calculates IXFR statistics correctly"
$DIG $DIGOPTS +noedns +stat -b @ test. ixfr=2 > dig.out1
get_dig_xfer_stats dig.out1 > stats.dig
diff ixfr-stats.good stats.dig || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
# Note: in the next two tests, we use ns4 logs for checking both incoming and
# outgoing transfer statistics as ns4 is both a secondary server (for ns3) and a
# primary server (for dig queries from the previous test) for "test".
echo_i "checking whether named calculates incoming IXFR statistics correctly"
get_named_xfer_stats ns4/ test "Transfer completed" > stats.incoming
diff ixfr-stats.good stats.incoming || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "checking whether named calculates outgoing IXFR statistics correctly"
get_named_xfer_stats ns4/ test "IXFR ended" > stats.outgoing
diff ixfr-stats.good stats.outgoing || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "exit status: $status"
[ $status -eq 0 ] || exit 1
......@@ -702,6 +702,7 @@
./bin/tests/system/integrity/ SH 2017,2018,2019
./bin/tests/system/ixfr/ans2/startme X 2011,2018,2019
./bin/tests/system/ixfr/ SH 2001,2004,2007,2011,2012,2014,2015,2016,2018,2019
./bin/tests/system/ixfr/ixfr-stats.good X 2019
./bin/tests/system/ixfr/ns1/startme X 2012,2013,2018,2019
./bin/tests/system/ixfr/ SH 2001,2004,2007,2012,2014,2016,2018,2019
./bin/tests/system/ixfr/ SH 2001,2004,2007,2011,2012,2013,2014,2016,2018,2019
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment