Merge branch 'allow-query' into 'master'

speed up allow_query test

Closes #81

See merge request !76

CHANGES

+4908.	[test]		Eliminated unnecessary waiting in the allow_query
+			system test. Also changed its name to allow-query.
+			[GL #81]
+
 4907.	[test]		Improved the reliabilty of the 'notify' system
 			test. [GL #59]
 

bin/tests/system/Makefile.in

@@ -47,17 +47,16 @@ feature-test@EXEEXT@: feature-test.@O@
 # used.
 
 # Define the tests that can be run in parallel.  This should be identical to
-# the definition of PARALLELDIRS in conf.sh. Note: long-running tests
-# such as allow_query and serve-stale are scheduled first to get more
+# the definition of PARALLELDIRS in conf.sh. Note: longer-running tests
+# such as serve-stale and rpzrecurse stale are scheduled first to get more
 # benefit from parallelism.
-
-PARALLEL = allow_query rpzrecurse serve-stale \
-	   acl additional addzone auth autosign \
+PARALLEL = rpzrecurse serve-stale dnssec \
+	   acl additional addzone allow-query auth autosign \
 	   builtin cacheclean case catz cds chain \
 	   checkconf checknames checkzone \
 	   @CHECKDS@ @COVERAGE@ @KEYMGR@ \
 	   cookie database digdelv dlv dlz dlzexternal \
-	   dns64 dnssec @DNSTAP@ dscp dsdigest dyndb \
+	   dns64 @DNSTAP@ dscp dsdigest dyndb \
 	   ednscompliance emptyzones \
 	   fetchlimit filter-aaaa formerr forward \
 	   geoip glue inline integrity ixfr keepalive \

bin/tests/system/allow_query/clean.sh → bin/tests/system/allow-query/clean.sh

@@ -17,4 +17,4 @@ rm -f dig.out.*
 rm -f ns2/named.conf ns2/controls.conf
 rm -f */named.memstats
 rm -f ns*/named.lock
-rm -f ns*/named.run
+rm -f ns*/named.run ns*/named.run.prev

bin/tests/system/allow_query/ns2/aclallow.db → bin/tests/system/allow-query/ns2/generic.db

@@ -7,9 +7,7 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: aclallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
-$ORIGIN aclallow.example.
+$ORIGIN @
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (
 				1          ; serial

bin/tests/system/allow_query/ns2/named01.conf.in → bin/tests/system/allow-query/ns2/named01.conf.in

@@ -26,5 +26,5 @@ zone "." {
 
 zone "normal.example" {
 	type master;
-	file "normal.db";
+	file "generic.db";
 };

bin/tests/system/allow_query/ns2/named02.conf.in → bin/tests/system/allow-query/ns2/named02.conf.in

@@ -27,5 +27,5 @@ zone "." {
 
 zone "normal.example" {
 	type master;
-	file "normal.db";
+	file "generic.db";
 };

bin/tests/system/allow_query/ns2/named03.conf.in → bin/tests/system/allow-query/ns2/named03.conf.in

@@ -27,5 +27,5 @@ zone "." {
 
 zone "normal.example" {
 	type master;
-	file "normal.db";
+	file "generic.db";
 };

bin/tests/system/allow_query/ns2/named04.conf.in → bin/tests/system/allow-query/ns2/named04.conf.in

@@ -27,5 +27,5 @@ zone "." {
 
 zone "normal.example" {
 	type master;
-	file "normal.db";
+	file "generic.db";
 };

bin/tests/system/allow_query/ns2/named05.conf.in → bin/tests/system/allow-query/ns2/named05.conf.in

@@ -27,5 +27,5 @@ zone "." {
 
 zone "normal.example" {
 	type master;
-	file "normal.db";
+	file "generic.db";
 };

bin/tests/system/allow_query/ns2/named06.conf.in → bin/tests/system/allow-query/ns2/named06.conf.in

@@ -27,5 +27,5 @@ zone "." {
 
 zone "normal.example" {
 	type master;
-	file "normal.db";
+	file "generic.db";
 };

bin/tests/system/allow_query/ns2/named07.conf.in → bin/tests/system/allow-query/ns2/named07.conf.in

@@ -29,5 +29,5 @@ zone "." {
 
 zone "normal.example" {
 	type master;
-	file "normal.db";
+	file "generic.db";
 };

bin/tests/system/allow_query/ns2/named08.conf.in → bin/tests/system/allow-query/ns2/named08.conf.in

@@ -29,5 +29,5 @@ zone "." {
 
 zone "normal.example" {
 	type master;
-	file "normal.db";
+	file "generic.db";
 };

bin/tests/system/allow_query/ns2/named09.conf.in → bin/tests/system/allow-query/ns2/named09.conf.in

@@ -29,5 +29,5 @@ zone "." {
 
 zone "normal.example" {
 	type master;
-	file "normal.db";
+	file "generic.db";
 };

bin/tests/system/allow_query/ns2/named10.conf.in → bin/tests/system/allow-query/ns2/named10.conf.in

@@ -32,5 +32,5 @@ zone "." {
 
 zone "normal.example" {
 	type master;
-	file "normal.db";
+	file "generic.db";
 };

bin/tests/system/allow_query/ns2/named11.conf.in → bin/tests/system/allow-query/ns2/named11.conf.in

@@ -38,5 +38,5 @@ zone "." {
 
 zone "normal.example" {
 	type master;
-	file "normal.db";
+	file "generic.db";
 };

bin/tests/system/allow_query/ns2/named12.conf.in → bin/tests/system/allow-query/ns2/named12.conf.in

@@ -32,5 +32,5 @@ zone "." {
 
 zone "normal.example" {
 	type master;
-	file "normal.db";
+	file "generic.db";
 };

bin/tests/system/allow_query/ns2/named21.conf.in → bin/tests/system/allow-query/ns2/named21.conf.in

@@ -28,6 +28,6 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 	};
 };

bin/tests/system/allow_query/ns2/named22.conf.in → bin/tests/system/allow-query/ns2/named22.conf.in

@@ -30,7 +30,7 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 	};
 
 };

bin/tests/system/allow_query/ns2/named23.conf.in → bin/tests/system/allow-query/ns2/named23.conf.in

@@ -30,7 +30,6 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 	};
 };
-

bin/tests/system/allow_query/ns2/named24.conf.in → bin/tests/system/allow-query/ns2/named24.conf.in

@@ -30,6 +30,6 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 	};
 };

bin/tests/system/allow_query/ns2/named25.conf.in → bin/tests/system/allow-query/ns2/named25.conf.in

@@ -30,6 +30,6 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 	};
 };

bin/tests/system/allow_query/ns2/named26.conf.in → bin/tests/system/allow-query/ns2/named26.conf.in

@@ -30,6 +30,6 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 	};
 };

bin/tests/system/allow_query/ns2/named27.conf.in → bin/tests/system/allow-query/ns2/named27.conf.in

@@ -32,7 +32,7 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 	};
 
 };

bin/tests/system/allow_query/ns2/named28.conf.in → bin/tests/system/allow-query/ns2/named28.conf.in

@@ -32,6 +32,6 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 	};
 };

bin/tests/system/allow_query/ns2/named29.conf.in → bin/tests/system/allow-query/ns2/named29.conf.in

@@ -32,6 +32,6 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 	};
 };

bin/tests/system/allow_query/ns2/named30.conf.in → bin/tests/system/allow-query/ns2/named30.conf.in

@@ -35,6 +35,6 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 	};
 };

bin/tests/system/allow_query/ns2/named31.conf.in → bin/tests/system/allow-query/ns2/named31.conf.in

@@ -42,6 +42,6 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 	};
 };

bin/tests/system/allow_query/ns2/named32.conf.in → bin/tests/system/allow-query/ns2/named32.conf.in

@@ -35,6 +35,6 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 	};
 };

bin/tests/system/allow_query/ns2/named33.conf.in → bin/tests/system/allow-query/ns2/named33.conf.in

@@ -31,7 +31,7 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 	};
 
 };

bin/tests/system/allow_query/ns2/named34.conf.in → bin/tests/system/allow-query/ns2/named34.conf.in

@@ -31,6 +31,6 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 	};
 };

bin/tests/system/allow_query/ns2/named40.conf.in → bin/tests/system/allow-query/ns2/named40.conf.in

@@ -40,68 +40,66 @@ zone "." {
 
 zone "normal.example" {
 	type master;
-	file "normal.db";
+	file "generic.db";
 };
 
 zone "any.example" {
 	type master;
-	file "any.db";
+	file "generic.db";
 	allow-query { any; };
 };
 
 zone "none.example" {
 	type master;
-	file "none.db";
+	file "generic.db";
 	allow-query { none; };
 };
 
 zone "addrallow.example" {
 	type master;
-	file "addrallow.db";
+	file "generic.db";
 	allow-query { 10.53.0.2; };
 };
 
 zone "addrnotallow.example" {
 	type master;
-	file "addrnotallow.db";
+	file "generic.db";
 	allow-query { 10.53.0.1; };
 };
 
 zone "addrdisallow.example" {
 	type master;
-	file "addrdisallow.db";
+	file "generic.db";
 	allow-query { ! 10.53.0.2; };
 };
 
 zone "aclallow.example" {
 	type master;
-	file "aclallow.db";
+	file "generic.db";
 	allow-query { accept; };
 };
 
 zone "aclnotallow.example" {
 	type master;
-	file "aclnotallow.db";
+	file "generic.db";
 	allow-query { badaccept; };
 };
 
 zone "acldisallow.example" {
 	type master;
-	file "acldisallow.db";
+	file "generic.db";
 	allow-query { ! accept; };
 };
 
 /* Also usable for testing key not allowed */
 zone "keyallow.example" {
 	type master;
-	file "keyallow.db";
+	file "generic.db";
 	allow-query { key one; };
 };
 
 zone "keydisallow.example" {
 	type master;
-	file "keydisallow.db";
+	file "generic.db";
 	allow-query { ! key one; };
 };
-
-

bin/tests/system/allow_query/ns2/named53.conf.in → bin/tests/system/allow-query/ns2/named53.conf.in

@@ -27,6 +27,6 @@ zone "." {
 
 zone "normal.example" {
 	type master;
-	file "normal.db";
+	file "generic.db";
 	allow-query { any; };
 };

bin/tests/system/allow_query/ns2/named54.conf.in → bin/tests/system/allow-query/ns2/named54.conf.in

@@ -27,6 +27,6 @@ zone "." {
 
 zone "normal.example" {
 	type master;
-	file "normal.db";
+	file "generic.db";
 	allow-query { none; };
 };

bin/tests/system/allow_query/ns2/named55.conf.in → bin/tests/system/allow-query/ns2/named55.conf.in

@@ -30,7 +30,7 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 		allow-query { any; };
 	};
 

bin/tests/system/allow_query/ns2/named56.conf.in → bin/tests/system/allow-query/ns2/named56.conf.in

@@ -30,7 +30,7 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 		allow-query { none; };
 	};
 };

bin/tests/system/allow_query/ns2/named57.conf.in → bin/tests/system/allow-query/ns2/named57.conf.in

@@ -29,12 +29,12 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 	};
 
 	zone "aclnotallow.example" {
 		type master;
-		file "aclnotallow.db";
+		file "generic.db";
 		allow-query-on { none; };
 	};
 };

bin/tests/system/allow_query/tests.sh → bin/tests/system/allow-query/tests.sh

@@ -17,29 +17,29 @@
 # expected match.
 # Test list:
 # In options:
-# default (any), any, none, [localhost, localnets], 
+# default (any), any, none, [localhost, localnets],
 # allowed address, not allowed address, denied address,
-# allowed key, not allowed key, denied key 
-# allowed acl, not allowed acl, denied acl (acls pointing to addresses) 
+# allowed key, not allowed key, denied key
+# allowed acl, not allowed acl, denied acl (acls pointing to addresses)
 #
 # Each of these tests requires changing to a new configuration
 # file and using rndc to update the server
 #
 # In view, with nothing in options (default to any)
-# default (any), any, none, [localhost, localnets], 
+# default (any), any, none, [localhost, localnets],
 # allowed address, not allowed address, denied address,
-# allowed key, not allowed key, denied key 
-# allowed acl, not allowed acl, denied acl (acls pointing to addresses) 
+# allowed key, not allowed key, denied key
+# allowed acl, not allowed acl, denied acl (acls pointing to addresses)
 #
 # In view, with options set to none, view set to any
 # In view, with options set to any, view set to none
 #
 # In zone, with nothing in options (default to any)
-# any, none, [localhost, localnets], 
-# allowed address, denied address, 
+# any, none, [localhost, localnets],
+# allowed address, denied address,
 # allowed key, not allowed key, denied key
 # allowed acl, not allowed acl, denied acl (acls pointing to addresses),
-# 
+#
 # In zone, with options set to none, zone set to any
 # In zone, with options set to any, zone set to none
 # In zone, with view set to none, zone set to any
@@ -47,7 +47,7 @@
 #
 # zone types of master, slave and stub can be tested in parallel by using
 # multiple instances (ns2 as master, ns3 as slave, ns4 as stub) and querying
-# as necessary. 
+# as necessary.
 #
 
 SYSTEMTESTTOP=..
@@ -57,11 +57,17 @@ DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noauth +noadd +nostats +dnss
 
 rndc_reload() {
     echo_i "`$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT} reload 2>&1 | sed 's/^/ns2 /'`"
+    for try in 0 1 2 3 4 5 6 7 8 9; do
+        nextpart ns2/named.run | grep "reloading configuration succeeded" > /dev/null && break
+        sleep 1
+    done
 }
 
 status=0
 n=0
 
+nextpart ns2/named.run > /dev/null
+
 # Test 1 - default, query allowed
 n=`expr $n + 1`
 echo_i "test $n: default - query allowed"
@@ -76,7 +82,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named02.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: explicit any - query allowed"
 ret=0
@@ -90,7 +95,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named03.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: none - query refused"
 ret=0
@@ -104,7 +108,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named04.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: address allowed - query allowed"
 ret=0
@@ -118,7 +121,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named05.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: address not allowed - query refused"
 ret=0
@@ -132,7 +134,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named06.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: address disallowed - query refused"
 ret=0
@@ -146,7 +147,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named07.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: acl allowed - query allowed"
 ret=0
@@ -160,7 +160,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named08.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: acl not allowed - query refused"
 ret=0
@@ -175,7 +174,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named09.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: acl disallowed - query refused"
 ret=0
@@ -189,7 +187,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named10.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: key allowed - query allowed"
 ret=0
@@ -203,7 +200,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named11.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: key not allowed - query refused"
 ret=0
@@ -217,7 +213,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named12.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: key disallowed - query refused"
 ret=0
@@ -234,7 +229,6 @@ n=20
 n=`expr $n + 1`
 copy_setports ns2/named21.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: views default - query allowed"
 ret=0
@@ -248,7 +242,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named22.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: views explicit any - query allowed"
 ret=0
@@ -262,7 +255,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named23.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: views none - query refused"
 ret=0
@@ -276,7 +268,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named24.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: views address allowed - query allowed"
 ret=0
@@ -290,7 +281,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named25.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: views address not allowed - query refused"
 ret=0
@@ -304,7 +294,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named26.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: views address disallowed - query refused"
 ret=0
@@ -318,7 +307,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named27.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: views acl allowed - query allowed"
 ret=0
@@ -332,7 +320,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named28.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: views acl not allowed - query refused"
 ret=0
@@ -346,7 +333,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named29.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: views acl disallowed - query refused"
 ret=0
@@ -360,7 +346,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named30.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: views key allowed - query allowed"
 ret=0
@@ -374,7 +359,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named31.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: views key not allowed - query refused"
 ret=0
@@ -388,7 +372,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`