diff --git a/bin/tests/system/inline/setup.sh b/bin/tests/system/inline/setup.sh index eb7d314c2a..61bcd4ab02 100644 --- a/bin/tests/system/inline/setup.sh +++ b/bin/tests/system/inline/setup.sh @@ -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 diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh index 818bfea257..e3794d3336 100755 --- a/bin/tests/system/inline/tests.sh +++ b/bin/tests/system/inline/tests.sh @@ -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