sync with HEAD

diff --git a/bin/tests/system/notify/clean.sh b/bin/tests/system/notify/clean.sh
index 6a08babd5f1b731d2eb1dc233e3207239beabe39..9ab44e810e6caf578319028288fc4c6fd07df0d6 100644 (file)
--- a/bin/tests/system/notify/clean.sh
+++ b/bin/tests/system/notify/clean.sh
@@ -15,12 +15,12 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.12 2007/09/26 03:22:44 marka Exp $
+# $Id: clean.sh,v 1.12.250.1 2011/10/17 02:41:22 marka Exp $
 
 #
 # Clean up after zone transfer tests.
 #
 
-rm -f ns3/example.bk dig.out.ns2 dig.out.ns3
+rm -f ns3/example.bk dig.out.ns2.test* dig.out.ns3.test*
 rm -f ns2/example.db
 rm -f */named.memstats

diff --git a/bin/tests/system/notify/ns2/example1.db b/bin/tests/system/notify/ns2/example1.db
index f08169363a6d336d83c657f762a8d469e4f4702a..82dce53bc7ca660e5b5bf04e8e9830ccc0190997 100644 (file)
--- a/bin/tests/system/notify/ns2/example1.db
+++ b/bin/tests/system/notify/ns2/example1.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example1.db,v 1.12 2007/06/19 23:47:04 tbox Exp $
+; $Id: example1.db,v 1.12.332.1 2011/10/17 02:41:22 marka Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes
@@ -93,7 +93,7 @@ mr02                  MR      .
 mx01                   MX      10 mail
 mx02                   MX      10 .
 naptr01                        NAPTR   0 0 "" "" "" .
-naptr02                        NAPTR   65535 65535 "blurgh" "blorf" "blegh" foo.
+naptr02                        NAPTR   65535 65535 "blurgh" "blorf" "blllbb" foo.
 nsap-ptr01             NSAP-PTR foo.
                        NSAP-PTR .
 nsap01                 NSAP    0x47000580005a0000000001e133ffffff00016100

diff --git a/bin/tests/system/notify/ns2/example2.db b/bin/tests/system/notify/ns2/example2.db
index 93ae0405d0d0e08dd3c94cbab96039b9fc006173..0c5769f19128b5aab1e83006e5a020e3f48b4f0e 100644 (file)
--- a/bin/tests/system/notify/ns2/example2.db
+++ b/bin/tests/system/notify/ns2/example2.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example2.db,v 1.12 2007/06/19 23:47:04 tbox Exp $
+; $Id: example2.db,v 1.12.332.1 2011/10/17 02:41:22 marka Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes
@@ -93,7 +93,7 @@ mr02                  MR      .
 mx01                   MX      10 mail
 mx02                   MX      10 .
 naptr01                        NAPTR   0 0 "" "" "" .
-naptr02                        NAPTR   65535 65535 "blurgh" "blorf" "blegh" foo.
+naptr02                        NAPTR   65535 65535 "blurgh" "blorf" "blllbb" foo.
 nsap-ptr01             NSAP-PTR foo.
                        NSAP-PTR .
 nsap01                 NSAP    0x47000580005a0000000001e133ffffff00016100

diff --git a/bin/tests/system/notify/ns2/example3.db b/bin/tests/system/notify/ns2/example3.db
index 3afbaa62aff6e79233cb5ac0527950edfc24ceb7..1ced28aada72a1e5f2310e118f057a633d57fb3a 100644 (file)
--- a/bin/tests/system/notify/ns2/example3.db
+++ b/bin/tests/system/notify/ns2/example3.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example3.db,v 1.12 2007/06/19 23:47:04 tbox Exp $
+; $Id: example3.db,v 1.12.332.1 2011/10/17 02:41:22 marka Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes
@@ -93,7 +93,7 @@ mr02                  MR      .
 mx01                   MX      10 mail
 mx02                   MX      10 .
 naptr01                        NAPTR   0 0 "" "" "" .
-naptr02                        NAPTR   65535 65535 "blurgh" "blorf" "blegh" foo.
+naptr02                        NAPTR   65535 65535 "blurgh" "blorf" "blllbb" foo.
 nsap-ptr01             NSAP-PTR foo.
                        NSAP-PTR .
 nsap01                 NSAP    0x47000580005a0000000001e133ffffff00016100

diff --git a/bin/tests/system/notify/ns2/example4.db b/bin/tests/system/notify/ns2/example4.db
index 8c18a372316d8c387b94a5a869ec38aa45e9d582..7f8dd37949f0b5d133d367e2bad651fa4683ac09 100644 (file)
--- a/bin/tests/system/notify/ns2/example4.db
+++ b/bin/tests/system/notify/ns2/example4.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example4.db,v 1.12 2007/06/19 23:47:04 tbox Exp $
+; $Id: example4.db,v 1.12.332.1 2011/10/17 02:41:22 marka Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes
@@ -93,7 +93,7 @@ mr02                  MR      .
 mx01                   MX      10 mail
 mx02                   MX      10 .
 naptr01                        NAPTR   0 0 "" "" "" .
-naptr02                        NAPTR   65535 65535 "blurgh" "blorf" "blegh" foo.
+naptr02                        NAPTR   65535 65535 "blurgh" "blorf" "blllbb" foo.
 nsap-ptr01             NSAP-PTR foo.
                        NSAP-PTR .
 nsap01                 NSAP    0x47000580005a0000000001e133ffffff00016100

diff --git a/bin/tests/system/notify/ns2/named.conf b/bin/tests/system/notify/ns2/named.conf
index f57a107f1db38b56fb6655628d7221d28b7a3524..fc88362ce74c520a4d89473873dea9e931997b03 100644 (file)
--- a/bin/tests/system/notify/ns2/named.conf
+++ b/bin/tests/system/notify/ns2/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.20 2007/06/19 23:47:04 tbox Exp $ */
+/* $Id: named.conf,v 1.20.332.1 2011/10/17 02:41:22 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -39,5 +39,4 @@ zone "." {
 zone "example" {
        type master;
        file "example.db";
-       allow-update { any; };
 };

diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh
index 0f142401b576978d34f9dc64804ccdb5b3e6a699..38d3c2750fb7c18388ebaba95242cb74f997fc11 100644 (file)
--- a/bin/tests/system/notify/tests.sh
+++ b/bin/tests/system/notify/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,78 +15,114 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.33 2007/06/19 23:47:04 tbox Exp $
+# $Id: tests.sh,v 1.33.332.1 2011/10/17 02:41:22 marka Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
 status=0
+n=0
 
+#
+# Wait up to 10 seconds for the servers to finish starting before testing.
+#
+for i in 1 2 3 4 5 6 7 8 9 10
+do
+       ret=0
+       $DIG +tcp example @10.53.0.2 soa -p 5300 > dig.out.ns2.test$n || ret=1
+       grep "status: NOERROR" dig.out.ns2.test$n > /dev/null || ret=1
+       grep "flags:.* aa[ ;]" dig.out.ns2.test$n > /dev/null || ret=1
+       $DIG +tcp example @10.53.0.3 soa -p 5300 > dig.out.ns3.test$n || ret=1
+       grep "status: NOERROR" dig.out.ns3.test$n > /dev/null || ret=1
+       grep "flags:.* aa[ ;]" dig.out.ns3.test$n > /dev/null || ret=1
+       [ $ret = 0 ] && break
+       sleep 1
+done
+
+n=`expr $n + 1`
+echo "I:checking initial status ($n)"
+ret=0
 $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd a.example.\
-       @10.53.0.2 a -p 5300 > dig.out.ns2 || status=1
-grep ";" dig.out.ns2
+       @10.53.0.2 a -p 5300 > dig.out.ns2.test$n || ret=1
+grep "10.0.0.1" dig.out.ns2.test$n > /dev/null || ret=1
 
 $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd a.example.\
-       @10.53.0.3 a -p 5300 > dig.out.ns3 || status=1
-grep ";" dig.out.ns3
+       @10.53.0.3 a -p 5300 > dig.out.ns3.test$n || ret=1
+grep "10.0.0.1" dig.out.ns3.test$n > /dev/null || ret=1
 
-$PERL ../digcomp.pl dig.out.ns2 dig.out.ns3 || status=1
+$PERL ../digcomp.pl dig.out.ns2.test$n dig.out.ns3.test$n || ret=1
 
+[ $ret = 0 ] || echo "I:failed"
+status=`expr $ret + $status`
+
+echo "I:reloading with example2 using HUP and waiting 45 seconds"
+sleep 1 # make sure filesystem time stamp is newer for reload.
 rm -f ns2/example.db
 cp -f ns2/example2.db ns2/example.db
 kill -HUP `cat ns2/named.pid`
 sleep 45
 
+n=`expr $n + 1`
+echo "I:checking example2 loaded ($n)"
+ret=0
 $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd a.example.\
-       @10.53.0.2 a -p 5300 > dig.out.ns2 || status=1
-grep ";" dig.out.ns2
-
-$DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd a.example.\
-       @10.53.0.3 a -p 5300 > dig.out.ns3 || status=1
-grep ";" dig.out.ns3
-
-$PERL ../digcomp.pl dig.out.ns2 dig.out.ns3 || status=1
-
-###
-# Why does not doing the stop not cause problems with the start further on?
-###
-$PERL $SYSTEMTESTTOP/stop.pl . ns3
-
-rm -f ns2/example.db
-cp -f ns2/example3.db ns2/example.db
-kill -HUP `cat ns2/named.pid`
-sleep 45
+       @10.53.0.2 a -p 5300 > dig.out.ns2.test$n || ret=1
+grep "10.0.0.2" dig.out.ns2.test$n > /dev/null || ret=1
 
-$PERL $SYSTEMTESTTOP/start.pl . ns3
+[ $ret = 0 ] || echo "I:failed"
+status=`expr $ret + $status`
 
+n=`expr $n + 1`
+echo "I:checking example2 contents have been transferred after HUP reload ($n)"
+ret=0
 $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd a.example.\
-       @10.53.0.2 a -p 5300 > dig.out.ns2 || status=1
-grep ";" dig.out.ns2
+       @10.53.0.2 a -p 5300 > dig.out.ns2.test$n || ret=1
+grep "10.0.0.2" dig.out.ns2.test$n > /dev/null || ret=1
 
 $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd a.example.\
-       @10.53.0.3 a -p 5300 > dig.out.ns3 || status=1
-grep ";" dig.out.ns3
+       @10.53.0.3 a -p 5300 > dig.out.ns3.test$n || ret=1
+grep "10.0.0.2" dig.out.ns3.test$n > /dev/null || ret=1
+
+$PERL ../digcomp.pl dig.out.ns2.test$n dig.out.ns3.test$n || ret=1
 
-$PERL ../digcomp.pl dig.out.ns2 dig.out.ns3 || status=1
+[ $ret = 0 ] || echo "I:failed"
+status=`expr $ret + $status`
 
+echo "I:stopping master and restarting with example4 then waiting 45 seconds"
 $PERL $SYSTEMTESTTOP/stop.pl . ns2
 
 rm -f ns2/example.db
 cp -f ns2/example4.db ns2/example.db
 
-$PERL $SYSTEMTESTTOP/start.pl . ns2
+$PERL $SYSTEMTESTTOP/start.pl --noclean --restart . ns2
 
 sleep 45
 
+n=`expr $n + 1`
+echo "I:checking example4 loaded ($n)"
+ret=0
 $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd a.example.\
-       @10.53.0.2 a -p 5300 > dig.out.ns2 || status=1
-grep ";" dig.out.ns2
+       @10.53.0.2 a -p 5300 > dig.out.ns2.test$n || ret=1
+grep "10.0.0.4" dig.out.ns2.test$n > /dev/null || ret=1
+
+[ $ret = 0 ] || echo "I:failed"
+status=`expr $ret + $status`
+
+n=`expr $n + 1`
+echo "I:checking example4 contents have been transfered after restart ($n)"
+ret=0
+$DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd a.example.\
+       @10.53.0.2 a -p 5300 > dig.out.ns2.test$n || ret=1
+grep "10.0.0.4" dig.out.ns2.test$n > /dev/null || ret=1
 
 $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd a.example.\
-       @10.53.0.3 a -p 5300 > dig.out.ns3 || status=1
-grep ";" dig.out.ns3
+       @10.53.0.3 a -p 5300 > dig.out.ns3.test$n || ret=1
+grep "10.0.0.4" dig.out.ns3.test$n > /dev/null || ret=1
+
+$PERL ../digcomp.pl dig.out.ns2.test$n dig.out.ns3.test$n || ret=1
 
-$PERL ../digcomp.pl dig.out.ns2 dig.out.ns3 || status=1
+[ $ret = 0 ] || echo "I:failed"
+status=`expr $ret + $status`
 
 echo "I:exit status: $status"
 exit $status