move RRL broken-config check to checkconf

the RRL test included a test case that tried to start named with
a broken configuration.  the same error could be found with
named-checkconf, so it should have been tested in the checkconf
system test.

(cherry picked from commit 05398c14889550a052cc262d454edbd05900bba7)
(cherry picked from commit 046b62bf02b0d98f1d54fef10f862cf61a408438)

diff --git a/bin/tests/system/rrl/broken.conf.in b/bin/tests/system/checkconf/bad-rrl-table-size.conf
similarity index 61%
rename from bin/tests/system/rrl/broken.conf.in
rename to bin/tests/system/checkconf/bad-rrl-table-size.conf
index 020542cfe74d0b3200027d7ab51628a9bd8db208..3325406fa88d092a625b20c5703a04c34abdc536 100644 (file)
--- a/bin/tests/system/rrl/broken.conf.in
+++ b/bin/tests/system/checkconf/bad-rrl-table-size.conf
@@ -11,19 +11,7 @@
  * information regarding copyright ownership.
  */
 
-controls { /* empty */ };
-
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       statistics-file "named.stats";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
-       notify no;
-
        rate-limit {
            responses-per-second 2;
            all-per-second 50;
@@ -35,12 +23,3 @@ options {
            max-table-size 0;
        };
 };
-
-key rndc_key {
-       secret "1234abcd8765";
-       algorithm hmac-sha256;
-};
-controls {
-       inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
-

diff --git a/bin/tests/system/rrl/clean.sh b/bin/tests/system/rrl/clean.sh
index 88c9a56670062b29bb148fdb07a193f1ea578e11..ce3db9b84192d5e67c985ee4e7e4aa25c1c8279c 100644 (file)
--- a/bin/tests/system/rrl/clean.sh
+++ b/bin/tests/system/rrl/clean.sh
@@ -18,6 +18,4 @@ rm -f */named.memstats */named.run */named.stats */log-* */session.key
 rm -f ns3/bl*.db */*.jnl */*.core */*.pid
 rm -f ns*/named.lock
 rm -f ns*/named.conf
-rm -f broken.conf
-rm -f broken.out
 rm -f ns*/managed-keys.bind*

diff --git a/bin/tests/system/rrl/setup.sh b/bin/tests/system/rrl/setup.sh
index be63ed9225c21baaa5cece96acb6239c3b7dd558..064230aa46c5c74c78d5dd672b503877d931cf83 100644 (file)
--- a/bin/tests/system/rrl/setup.sh
+++ b/bin/tests/system/rrl/setup.sh
@@ -16,7 +16,6 @@ SYSTEMTESTTOP=..
 
 $SHELL clean.sh
 
-copy_setports broken.conf.in broken.conf
 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
 copy_setports ns3/named.conf.in ns3/named.conf

diff --git a/bin/tests/system/rrl/tests.sh b/bin/tests/system/rrl/tests.sh
index 922050d52ac22afdf0bdb9b4ebaaca838b1ffa1c..a3d3176d00ec5a60208f7594cefcae951f1babab 100644 (file)
--- a/bin/tests/system/rrl/tests.sh
+++ b/bin/tests/system/rrl/tests.sh
@@ -279,14 +279,5 @@ $DIG $DIGOPTS @$ns4 TXT big.tld4 >/dev/null 2>&1
 grep "would limit" ns4/named.run >/dev/null 2>&1 \
   || setret "\"would limit\" not found in log file."
 
-$NAMED -D rrl-ns5 -gc broken.conf >broken.out 2>&1 &
-sleep 2
-grep "min-table-size 1" broken.out >/dev/null || setret "min-table-size 0 was not changed to 1"
-
-if [ -f named.pid ]; then
-  $KILL $(cat named.pid)
-  setret "named should not have started, but did"
-fi
-
 echo_i "exit status: $ret"
 [ $ret -eq 0 ] || exit 1