From a9b6bed6af61b33ce58aebe90e5670f0ad569568 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Mon, 26 Feb 2018 16:48:42 -0800
Subject: [PATCH] eliminate unnecessary waiting in allow-query test

- grep in the log to see if configuration is finished rather
  than sleeping for 5 seconds
---
 CHANGES                                       |  4 ++
 bin/tests/system/Makefile.in                  | 11 +++---
 bin/tests/system/allow-query/clean.sh         |  2 +-
 .../system/allow-query/ns2/acldisallow.db     | 24 ------------
 .../system/allow-query/ns2/aclnotallow.db     | 24 ------------
 bin/tests/system/allow-query/ns2/added.db     | 24 ------------
 bin/tests/system/allow-query/ns2/addrallow.db | 24 ------------
 .../system/allow-query/ns2/addrdisallow.db    | 24 ------------
 .../system/allow-query/ns2/addrnotallow.db    | 24 ------------
 bin/tests/system/allow-query/ns2/any.db       | 24 ------------
 .../ns2/{aclallow.db => generic.db}           |  2 +-
 bin/tests/system/allow-query/ns2/keyallow.db  | 24 ------------
 .../system/allow-query/ns2/keydisallow.db     | 24 ------------
 .../system/allow-query/ns2/named01.conf.in    |  2 +-
 .../system/allow-query/ns2/named02.conf.in    |  2 +-
 .../system/allow-query/ns2/named03.conf.in    |  2 +-
 .../system/allow-query/ns2/named04.conf.in    |  2 +-
 .../system/allow-query/ns2/named05.conf.in    |  2 +-
 .../system/allow-query/ns2/named06.conf.in    |  2 +-
 .../system/allow-query/ns2/named07.conf.in    |  2 +-
 .../system/allow-query/ns2/named08.conf.in    |  2 +-
 .../system/allow-query/ns2/named09.conf.in    |  2 +-
 .../system/allow-query/ns2/named10.conf.in    |  2 +-
 .../system/allow-query/ns2/named11.conf.in    |  2 +-
 .../system/allow-query/ns2/named12.conf.in    |  2 +-
 .../system/allow-query/ns2/named21.conf.in    |  2 +-
 .../system/allow-query/ns2/named22.conf.in    |  2 +-
 .../system/allow-query/ns2/named23.conf.in    |  2 +-
 .../system/allow-query/ns2/named24.conf.in    |  2 +-
 .../system/allow-query/ns2/named25.conf.in    |  2 +-
 .../system/allow-query/ns2/named26.conf.in    |  2 +-
 .../system/allow-query/ns2/named27.conf.in    |  2 +-
 .../system/allow-query/ns2/named28.conf.in    |  2 +-
 .../system/allow-query/ns2/named29.conf.in    |  2 +-
 .../system/allow-query/ns2/named30.conf.in    |  2 +-
 .../system/allow-query/ns2/named31.conf.in    |  2 +-
 .../system/allow-query/ns2/named32.conf.in    |  2 +-
 .../system/allow-query/ns2/named33.conf.in    |  2 +-
 .../system/allow-query/ns2/named34.conf.in    |  2 +-
 .../system/allow-query/ns2/named40.conf.in    | 22 +++++------
 .../system/allow-query/ns2/named53.conf.in    |  2 +-
 .../system/allow-query/ns2/named54.conf.in    |  2 +-
 .../system/allow-query/ns2/named55.conf.in    |  2 +-
 .../system/allow-query/ns2/named56.conf.in    |  2 +-
 .../system/allow-query/ns2/named57.conf.in    |  4 +-
 bin/tests/system/allow-query/ns2/none.db      | 24 ------------
 bin/tests/system/allow-query/ns2/normal.db    | 24 ------------
 bin/tests/system/allow-query/ns2/previous.db  | 24 ------------
 bin/tests/system/allow-query/tests.sh         | 37 +++----------------
 49 files changed, 60 insertions(+), 370 deletions(-)
 delete mode 100644 bin/tests/system/allow-query/ns2/acldisallow.db
 delete mode 100644 bin/tests/system/allow-query/ns2/aclnotallow.db
 delete mode 100644 bin/tests/system/allow-query/ns2/added.db
 delete mode 100644 bin/tests/system/allow-query/ns2/addrallow.db
 delete mode 100644 bin/tests/system/allow-query/ns2/addrdisallow.db
 delete mode 100644 bin/tests/system/allow-query/ns2/addrnotallow.db
 delete mode 100644 bin/tests/system/allow-query/ns2/any.db
 rename bin/tests/system/allow-query/ns2/{aclallow.db => generic.db} (96%)
 delete mode 100644 bin/tests/system/allow-query/ns2/keyallow.db
 delete mode 100644 bin/tests/system/allow-query/ns2/keydisallow.db
 delete mode 100644 bin/tests/system/allow-query/ns2/none.db
 delete mode 100644 bin/tests/system/allow-query/ns2/normal.db
 delete mode 100644 bin/tests/system/allow-query/ns2/previous.db

diff --git a/CHANGES b/CHANGES
index f2d965483a..35f7886b8c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+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]
 
diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index ff46210752..e3f1287fe3 100644
--- a/bin/tests/system/Makefile.in
+++ b/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 \
diff --git a/bin/tests/system/allow-query/clean.sh b/bin/tests/system/allow-query/clean.sh
index 33f9894d77..a36dbf6923 100644
--- a/bin/tests/system/allow-query/clean.sh
+++ b/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
diff --git a/bin/tests/system/allow-query/ns2/acldisallow.db b/bin/tests/system/allow-query/ns2/acldisallow.db
deleted file mode 100644
index 27794cb14d..0000000000
--- a/bin/tests/system/allow-query/ns2/acldisallow.db
+++ /dev/null
@@ -1,24 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$ORIGIN acldisallow.example.
-$TTL 300	; 5 minutes
-@                       IN SOA	mname1. . (
-				1          ; serial
-				20         ; refresh (20 seconds)
-				20         ; retry (20 seconds)
-				1814400    ; expire (3 weeks)
-				3600       ; minimum (1 hour)
-				)
-			NS	ns2
-ns2			A	10.53.0.2
-			MX	10 mail
-
-a			A	10.0.9.1
-mail			A	10.0.9.2
diff --git a/bin/tests/system/allow-query/ns2/aclnotallow.db b/bin/tests/system/allow-query/ns2/aclnotallow.db
deleted file mode 100644
index aefb1d033d..0000000000
--- a/bin/tests/system/allow-query/ns2/aclnotallow.db
+++ /dev/null
@@ -1,24 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$ORIGIN aclnotallow.example.
-$TTL 300	; 5 minutes
-@                       IN SOA	mname1. . (
-				1          ; serial
-				20         ; refresh (20 seconds)
-				20         ; retry (20 seconds)
-				1814400    ; expire (3 weeks)
-				3600       ; minimum (1 hour)
-				)
-			NS	ns2
-ns2			A	10.53.0.2
-			MX	10 mail
-
-a			A	10.0.8.1
-mail			A	10.0.8.2
diff --git a/bin/tests/system/allow-query/ns2/added.db b/bin/tests/system/allow-query/ns2/added.db
deleted file mode 100644
index 8a047a919a..0000000000
--- a/bin/tests/system/allow-query/ns2/added.db
+++ /dev/null
@@ -1,24 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$ORIGIN added.example.
-$TTL 300	; 5 minutes
-@                       IN SOA	mname1. . (
-				1          ; serial
-				20         ; refresh (20 seconds)
-				20         ; retry (20 seconds)
-				1814400    ; expire (3 weeks)
-				3600       ; minimum (1 hour)
-				)
-			NS	ns2
-ns2			A	10.53.0.2
-			MX	10 mail
-
-a			A	10.0.0.1
-mail			A	10.0.0.2
diff --git a/bin/tests/system/allow-query/ns2/addrallow.db b/bin/tests/system/allow-query/ns2/addrallow.db
deleted file mode 100644
index 62b9249bf6..0000000000
--- a/bin/tests/system/allow-query/ns2/addrallow.db
+++ /dev/null
@@ -1,24 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$ORIGIN addrallow.example.
-$TTL 300	; 5 minutes
-@                       IN SOA	mname1. . (
-				1          ; serial
-				20         ; refresh (20 seconds)
-				20         ; retry (20 seconds)
-				1814400    ; expire (3 weeks)
-				3600       ; minimum (1 hour)
-				)
-			NS	ns2
-ns2			A	10.53.0.2
-			MX	10 mail
-
-a			A	10.0.4.1
-mail			A	10.0.4.2
diff --git a/bin/tests/system/allow-query/ns2/addrdisallow.db b/bin/tests/system/allow-query/ns2/addrdisallow.db
deleted file mode 100644
index 492a1ec4d8..0000000000
--- a/bin/tests/system/allow-query/ns2/addrdisallow.db
+++ /dev/null
@@ -1,24 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$ORIGIN addrdisallow.example.
-$TTL 300	; 5 minutes
-@                       IN SOA	mname1. . (
-				1          ; serial
-				20         ; refresh (20 seconds)
-				20         ; retry (20 seconds)
-				1814400    ; expire (3 weeks)
-				3600       ; minimum (1 hour)
-				)
-			NS	ns2
-ns2			A	10.53.0.2
-			MX	10 mail
-
-a			A	10.0.6.1
-mail			A	10.0.6.2
diff --git a/bin/tests/system/allow-query/ns2/addrnotallow.db b/bin/tests/system/allow-query/ns2/addrnotallow.db
deleted file mode 100644
index 9f53ff7664..0000000000
--- a/bin/tests/system/allow-query/ns2/addrnotallow.db
+++ /dev/null
@@ -1,24 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$ORIGIN addrnotallow.example.
-$TTL 300	; 5 minutes
-@                       IN SOA	mname1. . (
-				1          ; serial
-				20         ; refresh (20 seconds)
-				20         ; retry (20 seconds)
-				1814400    ; expire (3 weeks)
-				3600       ; minimum (1 hour)
-				)
-			NS	ns2
-ns2			A	10.53.0.2
-			MX	10 mail
-
-a			A	10.0.5.1
-mail			A	10.0.5.2
diff --git a/bin/tests/system/allow-query/ns2/any.db b/bin/tests/system/allow-query/ns2/any.db
deleted file mode 100644
index c067e4c4f0..0000000000
--- a/bin/tests/system/allow-query/ns2/any.db
+++ /dev/null
@@ -1,24 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$ORIGIN any.example.
-$TTL 300	; 5 minutes
-@                       IN SOA	mname1. . (
-				1          ; serial
-				20         ; refresh (20 seconds)
-				20         ; retry (20 seconds)
-				1814400    ; expire (3 weeks)
-				3600       ; minimum (1 hour)
-				)
-			NS	ns2
-ns2			A	10.53.0.2
-			MX	10 mail
-
-a			A	10.0.1.1
-mail			A	10.0.1.2
diff --git a/bin/tests/system/allow-query/ns2/aclallow.db b/bin/tests/system/allow-query/ns2/generic.db
similarity index 96%
rename from bin/tests/system/allow-query/ns2/aclallow.db
rename to bin/tests/system/allow-query/ns2/generic.db
index 5ef2dd608a..dc51ce244c 100644
--- a/bin/tests/system/allow-query/ns2/aclallow.db
+++ b/bin/tests/system/allow-query/ns2/generic.db
@@ -7,7 +7,7 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-$ORIGIN aclallow.example.
+$ORIGIN @
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (
 				1          ; serial
diff --git a/bin/tests/system/allow-query/ns2/keyallow.db b/bin/tests/system/allow-query/ns2/keyallow.db
deleted file mode 100644
index 81d96a7d11..0000000000
--- a/bin/tests/system/allow-query/ns2/keyallow.db
+++ /dev/null
@@ -1,24 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$ORIGIN keyallow.example.
-$TTL 300	; 5 minutes
-@                       IN SOA	mname1. . (
-				1          ; serial
-				20         ; refresh (20 seconds)
-				20         ; retry (20 seconds)
-				1814400    ; expire (3 weeks)
-				3600       ; minimum (1 hour)
-				)
-			NS	ns2
-ns2			A	10.53.0.2
-			MX	10 mail
-
-a			A	10.0.10.1
-mail			A	10.0.10.2
diff --git a/bin/tests/system/allow-query/ns2/keydisallow.db b/bin/tests/system/allow-query/ns2/keydisallow.db
deleted file mode 100644
index d4acc257e8..0000000000
--- a/bin/tests/system/allow-query/ns2/keydisallow.db
+++ /dev/null
@@ -1,24 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$ORIGIN keydisallow.example.
-$TTL 300	; 5 minutes
-@                       IN SOA	mname1. . (
-				1          ; serial
-				20         ; refresh (20 seconds)
-				20         ; retry (20 seconds)
-				1814400    ; expire (3 weeks)
-				3600       ; minimum (1 hour)
-				)
-			NS	ns2
-ns2			A	10.53.0.2
-			MX	10 mail
-
-a			A	10.0.12.1
-mail			A	10.0.12.2
diff --git a/bin/tests/system/allow-query/ns2/named01.conf.in b/bin/tests/system/allow-query/ns2/named01.conf.in
index f39281cd4c..0395d9c9de 100644
--- a/bin/tests/system/allow-query/ns2/named01.conf.in
+++ b/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";
 };
diff --git a/bin/tests/system/allow-query/ns2/named02.conf.in b/bin/tests/system/allow-query/ns2/named02.conf.in
index efdc494b9f..3b0726ff89 100644
--- a/bin/tests/system/allow-query/ns2/named02.conf.in
+++ b/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";
 };
diff --git a/bin/tests/system/allow-query/ns2/named03.conf.in b/bin/tests/system/allow-query/ns2/named03.conf.in
index ff0fb71409..9d5fb48bdc 100644
--- a/bin/tests/system/allow-query/ns2/named03.conf.in
+++ b/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";
 };
diff --git a/bin/tests/system/allow-query/ns2/named04.conf.in b/bin/tests/system/allow-query/ns2/named04.conf.in
index 5d77e66016..88ee8de60d 100644
--- a/bin/tests/system/allow-query/ns2/named04.conf.in
+++ b/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";
 };
diff --git a/bin/tests/system/allow-query/ns2/named05.conf.in b/bin/tests/system/allow-query/ns2/named05.conf.in
index c733194e4c..7fbc72006d 100644
--- a/bin/tests/system/allow-query/ns2/named05.conf.in
+++ b/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";
 };
diff --git a/bin/tests/system/allow-query/ns2/named06.conf.in b/bin/tests/system/allow-query/ns2/named06.conf.in
index abac57e2f3..c4a0b9fe5d 100644
--- a/bin/tests/system/allow-query/ns2/named06.conf.in
+++ b/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";
 };
diff --git a/bin/tests/system/allow-query/ns2/named07.conf.in b/bin/tests/system/allow-query/ns2/named07.conf.in
index f7771c90eb..511e74c5eb 100644
--- a/bin/tests/system/allow-query/ns2/named07.conf.in
+++ b/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";
 };
diff --git a/bin/tests/system/allow-query/ns2/named08.conf.in b/bin/tests/system/allow-query/ns2/named08.conf.in
index 386594ab03..b0c3c6cd1d 100644
--- a/bin/tests/system/allow-query/ns2/named08.conf.in
+++ b/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";
 };
diff --git a/bin/tests/system/allow-query/ns2/named09.conf.in b/bin/tests/system/allow-query/ns2/named09.conf.in
index 5f1568f5f1..4f1d026d07 100644
--- a/bin/tests/system/allow-query/ns2/named09.conf.in
+++ b/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";
 };
diff --git a/bin/tests/system/allow-query/ns2/named10.conf.in b/bin/tests/system/allow-query/ns2/named10.conf.in
index c6ed24c259..c5f38c90bb 100644
--- a/bin/tests/system/allow-query/ns2/named10.conf.in
+++ b/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";
 };
diff --git a/bin/tests/system/allow-query/ns2/named11.conf.in b/bin/tests/system/allow-query/ns2/named11.conf.in
index 1cd7738d79..56e5cc4947 100644
--- a/bin/tests/system/allow-query/ns2/named11.conf.in
+++ b/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";
 };
diff --git a/bin/tests/system/allow-query/ns2/named12.conf.in b/bin/tests/system/allow-query/ns2/named12.conf.in
index 83688013fc..8381950dfa 100644
--- a/bin/tests/system/allow-query/ns2/named12.conf.in
+++ b/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";
 };
diff --git a/bin/tests/system/allow-query/ns2/named21.conf.in b/bin/tests/system/allow-query/ns2/named21.conf.in
index 7cee3e8c0a..c5ba1e8050 100644
--- a/bin/tests/system/allow-query/ns2/named21.conf.in
+++ b/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";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named22.conf.in b/bin/tests/system/allow-query/ns2/named22.conf.in
index 0e9c7f8a84..03907ffb8b 100644
--- a/bin/tests/system/allow-query/ns2/named22.conf.in
+++ b/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";
 	};
 
 };
diff --git a/bin/tests/system/allow-query/ns2/named23.conf.in b/bin/tests/system/allow-query/ns2/named23.conf.in
index 95dea47e3e..448b46297a 100644
--- a/bin/tests/system/allow-query/ns2/named23.conf.in
+++ b/bin/tests/system/allow-query/ns2/named23.conf.in
@@ -30,6 +30,6 @@ view "internal" {
 
 	zone "normal.example" {
 		type master;
-		file "normal.db";
+		file "generic.db";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named24.conf.in b/bin/tests/system/allow-query/ns2/named24.conf.in
index ed81fc25f6..401e0f4291 100644
--- a/bin/tests/system/allow-query/ns2/named24.conf.in
+++ b/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";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named25.conf.in b/bin/tests/system/allow-query/ns2/named25.conf.in
index a54088180f..03304028f2 100644
--- a/bin/tests/system/allow-query/ns2/named25.conf.in
+++ b/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";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named26.conf.in b/bin/tests/system/allow-query/ns2/named26.conf.in
index 856924a823..15b0b24757 100644
--- a/bin/tests/system/allow-query/ns2/named26.conf.in
+++ b/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";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named27.conf.in b/bin/tests/system/allow-query/ns2/named27.conf.in
index 00d3f51269..4519f7b187 100644
--- a/bin/tests/system/allow-query/ns2/named27.conf.in
+++ b/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";
 	};
 
 };
diff --git a/bin/tests/system/allow-query/ns2/named28.conf.in b/bin/tests/system/allow-query/ns2/named28.conf.in
index 7c2772ceb5..4b54a72e80 100644
--- a/bin/tests/system/allow-query/ns2/named28.conf.in
+++ b/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";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named29.conf.in b/bin/tests/system/allow-query/ns2/named29.conf.in
index f9ebc6c4cc..93a1e67e62 100644
--- a/bin/tests/system/allow-query/ns2/named29.conf.in
+++ b/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";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named30.conf.in b/bin/tests/system/allow-query/ns2/named30.conf.in
index 58987cada0..0e5ff55b95 100644
--- a/bin/tests/system/allow-query/ns2/named30.conf.in
+++ b/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";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named31.conf.in b/bin/tests/system/allow-query/ns2/named31.conf.in
index 954577aeac..faadb3f02f 100644
--- a/bin/tests/system/allow-query/ns2/named31.conf.in
+++ b/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";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named32.conf.in b/bin/tests/system/allow-query/ns2/named32.conf.in
index d9f9072efa..9e78dd0387 100644
--- a/bin/tests/system/allow-query/ns2/named32.conf.in
+++ b/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";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named33.conf.in b/bin/tests/system/allow-query/ns2/named33.conf.in
index 9282b3199f..f4ba389a72 100644
--- a/bin/tests/system/allow-query/ns2/named33.conf.in
+++ b/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";
 	};
 
 };
diff --git a/bin/tests/system/allow-query/ns2/named34.conf.in b/bin/tests/system/allow-query/ns2/named34.conf.in
index a16f498da5..5e05e6c8b7 100644
--- a/bin/tests/system/allow-query/ns2/named34.conf.in
+++ b/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";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named40.conf.in b/bin/tests/system/allow-query/ns2/named40.conf.in
index 91818e8dbb..f4bc3993e9 100644
--- a/bin/tests/system/allow-query/ns2/named40.conf.in
+++ b/bin/tests/system/allow-query/ns2/named40.conf.in
@@ -40,66 +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; };
 };
diff --git a/bin/tests/system/allow-query/ns2/named53.conf.in b/bin/tests/system/allow-query/ns2/named53.conf.in
index 93c76252c0..5dac2b993f 100644
--- a/bin/tests/system/allow-query/ns2/named53.conf.in
+++ b/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; };
 };
diff --git a/bin/tests/system/allow-query/ns2/named54.conf.in b/bin/tests/system/allow-query/ns2/named54.conf.in
index e823aece37..7014a75efa 100644
--- a/bin/tests/system/allow-query/ns2/named54.conf.in
+++ b/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; };
 };
diff --git a/bin/tests/system/allow-query/ns2/named55.conf.in b/bin/tests/system/allow-query/ns2/named55.conf.in
index 483b8530e4..058d223f44 100644
--- a/bin/tests/system/allow-query/ns2/named55.conf.in
+++ b/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; };
 	};
 
diff --git a/bin/tests/system/allow-query/ns2/named56.conf.in b/bin/tests/system/allow-query/ns2/named56.conf.in
index 3da1036a93..beeb9cd70e 100644
--- a/bin/tests/system/allow-query/ns2/named56.conf.in
+++ b/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; };
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named57.conf.in b/bin/tests/system/allow-query/ns2/named57.conf.in
index d5d205ae70..c1e77cb9bd 100644
--- a/bin/tests/system/allow-query/ns2/named57.conf.in
+++ b/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; };
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/none.db b/bin/tests/system/allow-query/ns2/none.db
deleted file mode 100644
index 22a4865604..0000000000
--- a/bin/tests/system/allow-query/ns2/none.db
+++ /dev/null
@@ -1,24 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$ORIGIN none.example.
-$TTL 300	; 5 minutes
-@                       IN SOA	mname1. . (
-				1          ; serial
-				20         ; refresh (20 seconds)
-				20         ; retry (20 seconds)
-				1814400    ; expire (3 weeks)
-				3600       ; minimum (1 hour)
-				)
-			NS	ns2
-ns2			A	10.53.0.2
-			MX	10 mail
-
-a			A	10.0.2.1
-mail			A	10.0.2.2
diff --git a/bin/tests/system/allow-query/ns2/normal.db b/bin/tests/system/allow-query/ns2/normal.db
deleted file mode 100644
index 50450928e9..0000000000
--- a/bin/tests/system/allow-query/ns2/normal.db
+++ /dev/null
@@ -1,24 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$ORIGIN normal.example.
-$TTL 300	; 5 minutes
-@                       IN SOA	mname1. . (
-				1          ; serial
-				20         ; refresh (20 seconds)
-				20         ; retry (20 seconds)
-				1814400    ; expire (3 weeks)
-				3600       ; minimum (1 hour)
-				)
-			NS	ns2
-ns2			A	10.53.0.2
-			MX	10 mail
-
-a			A	10.0.0.1
-mail			A	10.0.0.2
diff --git a/bin/tests/system/allow-query/ns2/previous.db b/bin/tests/system/allow-query/ns2/previous.db
deleted file mode 100644
index 7fe5517618..0000000000
--- a/bin/tests/system/allow-query/ns2/previous.db
+++ /dev/null
@@ -1,24 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$ORIGIN previous.example.
-$TTL 300	; 5 minutes
-@                       IN SOA	mname1. . (
-				1          ; serial
-				20         ; refresh (20 seconds)
-				20         ; retry (20 seconds)
-				1814400    ; expire (3 weeks)
-				3600       ; minimum (1 hour)
-				)
-			NS	ns2
-ns2			A	10.53.0.2
-			MX	10 mail
-
-a			A	10.0.0.1
-mail			A	10.0.0.2
diff --git a/bin/tests/system/allow-query/tests.sh b/bin/tests/system/allow-query/tests.sh
index 3c606def88..f36e5db611 100644
--- a/bin/tests/system/allow-query/tests.sh
+++ b/bin/tests/system/allow-query/tests.sh
@@ -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`
 copy_setports ns2/named32.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: views key disallowed - query refused"
 ret=0
@@ -402,7 +385,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named33.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: views over options, views allow - query allowed"
 ret=0
@@ -416,7 +398,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named34.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: views over options, views disallow - query refused"
 ret=0
@@ -434,7 +415,6 @@ n=40
 n=`expr $n + 1`
 copy_setports ns2/named40.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: zone default - query allowed"
 ret=0
@@ -558,7 +538,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named53.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: views over options, views allow - query allowed"
 ret=0
@@ -572,7 +551,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named54.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: views over options, views disallow - query refused"
 ret=0
@@ -586,7 +564,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named55.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: zones over views, views allow - query allowed"
 ret=0
@@ -600,7 +577,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named56.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: zones over views, views disallow - query refused"
 ret=0
@@ -614,7 +590,6 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 copy_setports ns2/named57.conf.in ns2/named.conf
 rndc_reload
-sleep 5
 
 echo_i "test $n: zones over views, allow-query-on"
 ret=0