ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

rt27739: make ixfr test more robust

Browse Source
This commit is contained in:
Mark Andrews
2012-02-07 00:19:45 +00:00
parent 2f4561bc9c
commit 9181e8a056
3 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/tests/system/ixfr/clean.sh
View File

@@ -15,9 +15,10 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.8 2011/09/06 23:46:27 tbox Exp $
# $Id: clean.sh,v 1.9 2012/02/07 00:19:45 marka Exp $
rm -f ns1/named.conf ns1/myftp.db
rm -f ns3/*.jnl ns3/mytest.db ns3/subtest.db
rm -f ns4/*.jnl ns4/*.db
rm -f */named.memstats
rm -f dig.out

4
bin/tests/system/ixfr/setup.sh
View File

@@ -15,9 +15,9 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: setup.sh,v 1.6 2011/09/06 23:46:27 tbox Exp $
# $Id: setup.sh,v 1.7 2012/02/07 00:19:45 marka Exp $
rm -f ns1/*.db ns1/*.jnl ns3/*.jnl ns4/*.jnl
rm -f ns1/*.db ns1/*.jnl ns3/*.jnl ns4/*.db ns4/*.jnl
cat <<EOF >ns1/named.conf
options {

26
bin/tests/system/ixfr/tests.sh
View File

@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.8 2011/09/06 22:29:32 smann Exp $
# $Id: tests.sh,v 1.9 2012/02/07 00:19:45 marka Exp $
# WARNING: The test labelled "testing request-ixfr option in view vs zone"
@@ -153,7 +153,13 @@ fi
cp ns3/mytest1.db ns3/mytest.db
$RNDC -s 10.53.0.3 -p 9953 -c ../common/rndc.conf reload
sleep 2
for i in 0 1 2 3 4 5 6 7 8 9
do
$DIG +tcp -p 5300 @10.53.0.4 SOA test > dig.out
grep -i "hostmaster\.test\..2" dig.out > /dev/null && break
sleep 1
done
# slave should have gotten notify and updated
@@ -173,7 +179,13 @@ echo "I:testing request-ixfr option in view vs zone"
echo "I: this result should be AXFR"
cp ns3/subtest1.db ns3/subtest.db # change to sub.test zone, should be AXFR
$RNDC -s 10.53.0.3 -p 9953 -c ../common/rndc.conf reload
sleep 2
for i in 0 1 2 3 4 5 6 7 8 9
do
$DIG +tcp -p 5300 @10.53.0.4 SOA sub.test > dig.out
grep -i "hostmaster\.test\..3" dig.out > /dev/null && break
sleep 1
done
echo "I: this result should be AXFR"
NONINCR=`grep 'sub\.test/IN/primary' ns4/named.run|grep "got nonincremental" | wc -l`
@@ -188,7 +200,13 @@ fi
echo "I: this result should be IXFR"
cp ns3/mytest2.db ns3/mytest.db # change to test zone, should be IXFR
$RNDC -s 10.53.0.3 -p 9953 -c ../common/rndc.conf reload
sleep 2
for i in 0 1 2 3 4 5 6 7 8 9
do
$DIG +tcp -p 5300 @10.53.0.4 SOA test > dig.out
grep -i "hostmaster\.test\..4" dig.out > /dev/null && break
sleep 1
done
INCR=`grep "test/IN/primary" ns4/named.run|grep "got incremental"|wc -l`
if [ $INCR -ne 2 ]