upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

eliminate unnecessary waiting in allow-query test

Browse source 
- grep in the log to see if configuration is finished rather
  than sleeping for 5 seconds
This commit is contained in:
Evan Hunt 2018-02-26 16:48:42 -08:00
parent ffc3e73c36
commit a9b6bed6af
49 changed files with 60 additions and 370 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -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]

11
bin/tests/system/Makefile.in
View file

@ -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 \

2
bin/tests/system/allow-query/clean.sh
View file

@ -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

24
bin/tests/system/allow-query/ns2/acldisallow.db
View file

@ -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

24
bin/tests/system/allow-query/ns2/aclnotallow.db
View file

@ -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

24
bin/tests/system/allow-query/ns2/added.db
View file

@ -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

24
bin/tests/system/allow-query/ns2/addrallow.db
View file

@ -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

24
bin/tests/system/allow-query/ns2/addrdisallow.db
View file

@ -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

24
bin/tests/system/allow-query/ns2/addrnotallow.db
View file

@ -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

24
bin/tests/system/allow-query/ns2/any.db
View file

@ -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

2
bin/tests/system/allow-query/ns2/aclallow.db → bin/tests/system/allow-query/ns2/generic.db
View file

@ -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

24
bin/tests/system/allow-query/ns2/keyallow.db
View file

@ -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

24
bin/tests/system/allow-query/ns2/keydisallow.db
View file

@ -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

2
bin/tests/system/allow-query/ns2/named01.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named02.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named03.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named04.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named05.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named06.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named07.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named08.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named09.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named10.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named11.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named12.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named21.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named22.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named23.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named24.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named25.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named26.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named27.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named28.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named29.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named30.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named31.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named32.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named33.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named34.conf.in
View file

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

22
bin/tests/system/allow-query/ns2/named40.conf.in
View file

@ -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; };
};

2
bin/tests/system/allow-query/ns2/named53.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named54.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named55.conf.in
View file

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

2
bin/tests/system/allow-query/ns2/named56.conf.in
View file

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

4
bin/tests/system/allow-query/ns2/named57.conf.in
View file

@ -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; };
};
};

24
bin/tests/system/allow-query/ns2/none.db
View file

@ -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

24
bin/tests/system/allow-query/ns2/normal.db
View file

@ -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

24
bin/tests/system/allow-query/ns2/previous.db
View file

@ -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

37
bin/tests/system/allow-query/tests.sh
View file

@ -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