Fix problem in notify test

diff --git a/bin/tests/system/notify/ns2/example1.db b/bin/tests/system/notify/ns2/example1.db
index b0c72e4e7e0b05551a5b5c26a09dccb6e50315de..3b11e0027660a079746f47b0b7cbaccb4fe81829 100644 (file)
--- a/bin/tests/system/notify/ns2/example1.db
+++ b/bin/tests/system/notify/ns2/example1.db
@@ -2,8 +2,8 @@ $ORIGIN .
 $TTL 300       ; 5 minutes
 example                        IN SOA  mname1. . (
                                1          ; serial
-                               20         ; refresh (20 seconds)
-                               20         ; retry (20 seconds)
+                               300        ; refresh (300 seconds)
+                               300        ; retry (300 seconds)
                                1814400    ; expire (3 weeks)
                                3600       ; minimum (1 hour)
                                )

diff --git a/bin/tests/system/notify/ns2/example2.db b/bin/tests/system/notify/ns2/example2.db
index cec8e09be79c24b78013d11d39b33cfa2768a151..ab2bb6a24becf8ce7f068bc9315cae1bd4b05b51 100644 (file)
--- a/bin/tests/system/notify/ns2/example2.db
+++ b/bin/tests/system/notify/ns2/example2.db
@@ -2,8 +2,8 @@ $ORIGIN .
 $TTL 300       ; 5 minutes
 example                        IN SOA  mname1. . (
                                2          ; serial
-                               20         ; refresh (20 seconds)
-                               20         ; retry (20 seconds)
+                               300        ; refresh (300 seconds)
+                               300        ; retry (300 seconds)
                                1814400    ; expire (3 weeks)
                                3600       ; minimum (1 hour)
                                )

diff --git a/bin/tests/system/notify/ns2/example3.db b/bin/tests/system/notify/ns2/example3.db
index 55fc952371d6d72fd37a2b008d2b03d25fd45f84..e444a4c4c8ddb385a2239c239ff4f9397087927a 100644 (file)
--- a/bin/tests/system/notify/ns2/example3.db
+++ b/bin/tests/system/notify/ns2/example3.db
@@ -2,8 +2,8 @@ $ORIGIN .
 $TTL 300       ; 5 minutes
 example                        IN SOA  mname1. . (
                                3          ; serial
-                               20         ; refresh (20 seconds)
-                               20         ; retry (20 seconds)
+                               300        ; refresh (300 seconds)
+                               300        ; retry (300 seconds)
                                1814400    ; expire (3 weeks)
                                3600       ; minimum (1 hour)
                                )

diff --git a/bin/tests/system/notify/ns2/example4.db b/bin/tests/system/notify/ns2/example4.db
index dbabb2cccbf0135f1718f9ea1e6c6c85b4854db5..6496db0aa11cadff5b7fd664d5810e64b8259f7a 100644 (file)
--- a/bin/tests/system/notify/ns2/example4.db
+++ b/bin/tests/system/notify/ns2/example4.db
@@ -2,8 +2,8 @@ $ORIGIN .
 $TTL 300       ; 5 minutes
 example                        IN SOA  mname1. . (
                                4          ; serial
-                               20         ; refresh (20 seconds)
-                               20         ; retry (20 seconds)
+                               300        ; refresh (300 seconds)
+                               300        ; retry (300 seconds)
                                1814400    ; expire (3 weeks)
                                3600       ; minimum (1 hour)
                                )

diff --git a/bin/tests/system/notify/ns2/named.conf b/bin/tests/system/notify/ns2/named.conf
index c70979a719f62bcf28b024ce5310088649f27589..57402f61eb631e695e75fda45efe4b54956a6765 100644 (file)
--- a/bin/tests/system/notify/ns2/named.conf
+++ b/bin/tests/system/notify/ns2/named.conf
@@ -3,6 +3,7 @@ options {
        listen-on { 10.53.0.2; };
        recursion no;
        notify yes;
+       query-source address 10.53.0.2;
 };
 
 zone "." {

diff --git a/bin/tests/system/notify/ns3/named.conf b/bin/tests/system/notify/ns3/named.conf
index f12441b2c870efa8a544b3c2e85ee80cf5f76ed3..bbf30f0fc6e0612ebcf37b0035a5e7d324323db5 100644 (file)
--- a/bin/tests/system/notify/ns3/named.conf
+++ b/bin/tests/system/notify/ns3/named.conf
@@ -4,6 +4,7 @@ options {
        listen-on { 10.53.0.3; };
        recursion yes;
        notify yes;
+       query-source address 10.53.0.3;
 };
 
 zone "." {

diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh
index d92da1581c3dc423e4897cc4a05a99fdca8fdaf0..a1b82a1c4c95ad6eb8b2c22039dee5a7e2a7dbfe 100644 (file)
--- a/bin/tests/system/notify/tests.sh
+++ b/bin/tests/system/notify/tests.sh
@@ -53,7 +53,7 @@ rm -f ns2/example.db
 cp ns2/example2.db ns2/example.db
 sleep 6
 kill -HUP `cat ns2/named.pid`
-sleep 30
+sleep 6
 
 ../../../dig/dig +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd a.example.\
        @10.53.0.2 a > dig.out.ns2
@@ -74,7 +74,7 @@ cp ns2/example3.db ns2/example.db
 sleep 6
 kill -HUP `cat ns2/named.pid`
 (cd ns3 ; $NAMED -c named.conf -d 99 -g >> named.run 2>&1 & )
-sleep 30
+sleep 6
 
 ../../../dig/dig +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd a.example.\
        @10.53.0.2 a > dig.out.ns2
@@ -94,7 +94,7 @@ kill `cat ns2/named.pid`
 cp ns2/example4.db ns2/example.db
 sleep 6
 (cd ns2 ; $NAMED -c named.conf -d 99 -g >> named.run 2>&1 & )
-sleep 30
+sleep 6
 
 ../../../dig/dig +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd a.example.\
        @10.53.0.2 a > dig.out.ns2