From 00164c8db201d5acce96972b510d51bfa057a9c8 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 16 Jan 2012 08:35:09 +0000
Subject: [PATCH] fetches in progress/buckets

---
 bin/tests/system/inline/clean.sh          |  4 ++--
 bin/tests/system/inline/ns3/master.db.in  |  4 ++--
 bin/tests/system/inline/ns3/master2.db.in |  4 ++--
 bin/tests/system/inline/tests.sh          | 17 ++++++++++++++++-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/bin/tests/system/inline/clean.sh b/bin/tests/system/inline/clean.sh
index dafe5f6dd4..a29b6e77e0 100644
--- a/bin/tests/system/inline/clean.sh
+++ b/bin/tests/system/inline/clean.sh
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.10 2012/01/10 23:46:58 tbox Exp $
+# $Id: clean.sh,v 1.11 2012/01/16 08:35:08 marka Exp $
 
 rm -f */named.memstats
 rm -f */named.run
@@ -58,7 +58,7 @@ rm -f ns5/bits.bk
 rm -f ns5/bits.bk.jnl
 rm -f ns5/bits.bk.signed
 rm -f ns5/bits.bk.signed.jnl
-rm -f */*.jbk
+# rm -f */*.jbk
 rm -f random.data
 rm -f dig.out.ns*.test*
 rm -f signing.out*
diff --git a/bin/tests/system/inline/ns3/master.db.in b/bin/tests/system/inline/ns3/master.db.in
index 8f5690d6d5..c227a0bdeb 100644
--- a/bin/tests/system/inline/ns3/master.db.in
+++ b/bin/tests/system/inline/ns3/master.db.in
@@ -12,10 +12,10 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: master.db.in,v 1.2 2011/10/26 20:56:45 marka Exp $
+; $Id: master.db.in,v 1.3 2012/01/16 08:35:09 marka Exp $
 
 $TTL 300	; 5 minutes
-@			IN SOA	ns2 . (
+@			IN SOA	ns3 . (
 				2000042407 ; serial
 				20         ; refresh (20 seconds)
 				20         ; retry (20 seconds)
diff --git a/bin/tests/system/inline/ns3/master2.db.in b/bin/tests/system/inline/ns3/master2.db.in
index 5b3fcaaeba..28b8a51c8a 100644
--- a/bin/tests/system/inline/ns3/master2.db.in
+++ b/bin/tests/system/inline/ns3/master2.db.in
@@ -12,10 +12,10 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: master2.db.in,v 1.2 2011/10/26 20:56:45 marka Exp $
+; $Id: master2.db.in,v 1.3 2012/01/16 08:35:09 marka Exp $
 
 $TTL 300	; 5 minutes
-@			IN SOA	ns2 . (
+@			IN SOA	ns3 . (
 				2000042408 ; serial
 				20         ; refresh (20 seconds)
 				20         ; retry (20 seconds)
diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh
index c3111c3173..8c3effa211 100644
--- a/bin/tests/system/inline/tests.sh
+++ b/bin/tests/system/inline/tests.sh
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.14 2012/01/12 00:37:18 each Exp $
+# $Id: tests.sh,v 1.15 2012/01/16 08:35:09 marka Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -420,6 +420,10 @@ $PERL ../stop.pl . ns3 || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
+n=`expr $n + 1`
+echo "I:update master zone while shutdown ($n)"
+cp ns3/master3.db.in ns3/master.db
+
 n=`expr $n + 1`
 echo "I:restart bump in the wire signer server ($n)"
 ret=0
@@ -427,6 +431,17 @@ $PERL ../start.pl --noclean --restart . ns3 || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
+
+####n=`expr $n + 1`
+####echo "I:checking that update while server is offline is detected ($n)"
+####ret=0
+####$DIG $DIGOPTS @10.53.0.3 -p 5300 f.master A > dig.out.ns2.test$n
+####grep "status: NOERROR" dig.out.ns2.test$n > /dev/null || ret=1
+####grep "ANSWER: 2," dig.out.ns2.test$n > /dev/null || ret=1
+####grep "10.0.0.6" dig.out.ns2.test$n > /dev/null || ret=1
+####if [ $ret != 0 ]; then echo "I:failed"; fi
+####status=`expr $status + $ret`
+
 $NSUPDATE << EOF
 zone bits
 server 10.53.0.2 5300