Commit 37a6bb00 authored by Evan Hunt's avatar Evan Hunt

eliminate unnecessary waiting in allow-query test

- grep in the log to see if configuration is finished rather
  than sleeping for 5 seconds

(cherry picked from commit a9b6bed6)
parent 5d9e3f9b
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]
......
......@@ -44,16 +44,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
# the definition of PARALLELDIRS in conf.sh. Note: longer-running tests
# such as serve-stale and rpzrecurse are scheduled first to get more
# benefit from parallelism.
PARALLEL = allow-query rpzrecurse \
acl additional addzone autosign \
PARALLEL = rpzrecurse dnssec \
acl additional addzone allow-query 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 \
......
......@@ -14,4 +14,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
; Copyright (C) 2010, 2016 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/.
$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
; Copyright (C) 2010, 2016 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/.
$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
; Copyright (C) 2010, 2016 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/.
$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
; Copyright (C) 2010, 2016 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/.
$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
; Copyright (C) 2010, 2016 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/.
$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
; Copyright (C) 2010, 2016 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/.
$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
; Copyright (C) 2010, 2016 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/.
$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
......@@ -4,7 +4,7 @@
; 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/.
$ORIGIN aclallow.example.
$ORIGIN @
$TTL 300 ; 5 minutes
@ IN SOA mname1. . (
1 ; serial
......
; Copyright (C) 2010, 2016 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/.
$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
; Copyright (C) 2010, 2016 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/.
$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
......@@ -25,5 +25,5 @@ zone "." {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
......@@ -26,5 +26,5 @@ zone "." {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
......@@ -26,5 +26,5 @@ zone "." {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
......@@ -26,5 +26,5 @@ zone "." {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
......@@ -26,5 +26,5 @@ zone "." {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
......@@ -26,5 +26,5 @@ zone "." {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
......@@ -28,5 +28,5 @@ zone "." {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
......@@ -28,5 +28,5 @@ zone "." {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
......@@ -28,5 +28,5 @@ zone "." {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
......@@ -31,5 +31,5 @@ zone "." {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
......@@ -37,5 +37,5 @@ zone "." {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
......@@ -31,5 +31,5 @@ zone "." {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
......@@ -27,6 +27,6 @@ view "internal" {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
};
......@@ -29,7 +29,7 @@ view "internal" {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
};
......@@ -29,6 +29,6 @@ view "internal" {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
};
......@@ -29,6 +29,6 @@ view "internal" {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
};
......@@ -29,6 +29,6 @@ view "internal" {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
};
......@@ -29,6 +29,6 @@ view "internal" {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
};
......@@ -31,7 +31,7 @@ view "internal" {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
};
......@@ -31,6 +31,6 @@ view "internal" {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
};
......@@ -31,6 +31,6 @@ view "internal" {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
};
......@@ -34,6 +34,6 @@ view "internal" {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
};
......@@ -41,6 +41,6 @@ view "internal" {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
};
......@@ -34,6 +34,6 @@ view "internal" {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
};
......@@ -30,7 +30,7 @@ view "internal" {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
};
......@@ -30,6 +30,6 @@ view "internal" {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
};
};
......@@ -39,66 +39,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; };
};
......@@ -26,6 +26,6 @@ zone "." {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
allow-query { any; };
};
......@@ -26,6 +26,6 @@ zone "." {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
allow-query { none; };
};
......@@ -29,7 +29,7 @@ view "internal" {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
allow-query { any; };
};
......
......@@ -29,7 +29,7 @@ view "internal" {
zone "normal.example" {
type master;
file "normal.db";
file "generic.db";
allow-query { none; };
};
};
......@@ -28,12 +28,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; };
};
};
; Copyright (C) 2010, 2016 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/.
$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
; Copyright (C) 2010, 2016 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/.
$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
; Copyright (C) 2010, 2016 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/.
$ORIGIN previous.example.
$TTL 300 ; 5 minutes