From df22852dcd8198318e0392f4bb66990510cd6da2 Mon Sep 17 00:00:00 2001 From: Michael Sawyer Date: Tue, 23 May 2000 02:13:39 +0000 Subject: [PATCH] Fix problem in notify test --- bin/tests/system/notify/ns2/example1.db | 4 ++-- bin/tests/system/notify/ns2/example2.db | 4 ++-- bin/tests/system/notify/ns2/example3.db | 4 ++-- bin/tests/system/notify/ns2/example4.db | 4 ++-- bin/tests/system/notify/ns2/named.conf | 1 + bin/tests/system/notify/ns3/named.conf | 1 + bin/tests/system/notify/tests.sh | 6 +++--- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/bin/tests/system/notify/ns2/example1.db b/bin/tests/system/notify/ns2/example1.db index b0c72e4e7e..3b11e00276 100644 --- 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 cec8e09be7..ab2bb6a24b 100644 --- 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 55fc952371..e444a4c4c8 100644 --- 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 dbabb2cccb..6496db0aa1 100644 --- 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 c70979a719..57402f61eb 100644 --- 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 f12441b2c8..bbf30f0fc6 100644 --- 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 d92da1581c..a1b82a1c4c 100644 --- 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