Fix inline test with missing $INCLUDE

The test case for a zone with a missing include file was wrong for two
reasons:
1. It was loading the wrong file (master5 instead of master6)
2. It did actually not set the $ret variable to 1 if the test failed
   (it should default to ret=1 and clear the variable if the
   appropriate log is found).
This commit is contained in:
Matthijs Mekking
2021-03-19 15:23:01 +01:00
parent 6463ee0f40
commit 96583e7c40
2 changed files with 5 additions and 4 deletions

View File

@@ -30,6 +30,7 @@ cp ns3/master.db.in ns3/nsec3.db
cp ns3/master.db.in ns3/externalkey.db
cp ns3/master.db.in ns3/delayedkeys.db
cp ns3/master.db.in ns3/removedkeys-primary.db
cp ns3/include.db.in ns3/include.db
mkdir ns3/removedkeys

View File

@@ -940,17 +940,17 @@ status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "check that reloading errors prevent synchronization ($n)"
ret=0
ret=1
$DIG $DIGOPTS +short @10.53.0.3 master SOA > dig.out.ns3.test$n.1 || ret=1
sleep 1
nextpart ns3/named.run > /dev/null
cp ns3/master5.db.in ns3/master.db
cp ns3/master6.db.in ns3/master.db
rndc_reload ns3 10.53.0.3
for i in 1 2 3 4 5 6 7 8 9 10
do
if nextpart ns3/named.run |
grep "not loaded due to errors" > /dev/null
if nextpart ns3/named.run | grep "not loaded due to errors" > /dev/null
then
ret=0
break
fi
sleep 1