Revive dialup system test

Properly template the port number in config files with copy_setports.

The test takes two minutes on my machine which doesn't seem like a
proper justification to exclude it from the test suite, especially
considering we run these tests in parallel nowadays. The resource usage
doesn't seems significantly increased so it shouldn't interfere with
other system tests.

There also exists a precedent for longer running system tests that are
already part of the default system test suite (e.g. serve-stale takes
almost three minutes on the same machine).

(cherry picked from commit 235ae5f344895fa5d20924e5eeba74a24b33d5d7)

diff --git a/bin/tests/system/conf.sh.common b/bin/tests/system/conf.sh.common
index a7b19e86c25327a8254376e2201d4d8adb44f012..bbd91953faef9b928b439d1718dcd90d851f8089 100644 (file)
--- a/bin/tests/system/conf.sh.common
+++ b/bin/tests/system/conf.sh.common
@@ -29,8 +29,8 @@ export LANG=C
 #
 # The "stress" test is not run by default since it creates enough
 # load on the machine to make it unusable to other users.
-# The "dialup" and "dupsigs" tests are also not run by
-# default because they take a very long time to complete.
+# The "dupsigs" test is not run by default because it takes
+# a very long time to complete.
 #
 # The following tests are hard-coded to use ports 5300 and 9953. For
 # this reason, these must be run sequentially.

diff --git a/bin/tests/system/dialup/clean.sh b/bin/tests/system/dialup/clean.sh
index 581c3ccdfafe29b39acd0e81cc11aab4673b12a0..9318255bfaf01c2a2569741c648b1fc5e2ec47ab 100644 (file)
--- a/bin/tests/system/dialup/clean.sh
+++ b/bin/tests/system/dialup/clean.sh
@@ -14,3 +14,5 @@
 rm -f ns2/example.bk
 rm -f ns3/example.bk
 rm -f */named.memstats */named.run
+rm -f ns*/named.conf
+rm -f ns*/named.lock

diff --git a/bin/tests/system/dialup/ns1/named.conf b/bin/tests/system/dialup/ns1/named.conf.in
similarity index 98%
rename from bin/tests/system/dialup/ns1/named.conf
rename to bin/tests/system/dialup/ns1/named.conf.in
index 0fe31ae4bc000bfba6737e41c8f6e81fc12f943f..8ed56a836fc7a1e9c96ade5a36ee19f8e8608892 100644 (file)
--- a/bin/tests/system/dialup/ns1/named.conf
+++ b/bin/tests/system/dialup/ns1/named.conf.in
@@ -17,7 +17,7 @@ options {
        query-source address 10.53.0.1;
        notify-source 10.53.0.1;
        transfer-source 10.53.0.1;
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.1; };
        listen-on-v6 { none; };

diff --git a/bin/tests/system/dialup/ns2/named.conf b/bin/tests/system/dialup/ns2/named.conf.in
similarity index 98%
rename from bin/tests/system/dialup/ns2/named.conf
rename to bin/tests/system/dialup/ns2/named.conf.in
index f1e61edfdfec058a1e5a8430f23871a953571827..a30bb0d9255c764a0d840cdcd2de8f61b6d24573 100644 (file)
--- a/bin/tests/system/dialup/ns2/named.conf
+++ b/bin/tests/system/dialup/ns2/named.conf.in
@@ -17,7 +17,7 @@ options {
        query-source address 10.53.0.2;
        notify-source 10.53.0.2;
        transfer-source 10.53.0.2;
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };

diff --git a/bin/tests/system/dialup/ns3/named.conf b/bin/tests/system/dialup/ns3/named.conf.in
similarity index 98%
rename from bin/tests/system/dialup/ns3/named.conf
rename to bin/tests/system/dialup/ns3/named.conf.in
index 9ee5b0addf2a9d8eb0dd2cbac8908067989d85ef..df6514d7201d82b0ab2bd26a74abeb081dfefdaa 100644 (file)
--- a/bin/tests/system/dialup/ns3/named.conf
+++ b/bin/tests/system/dialup/ns3/named.conf.in
@@ -17,7 +17,7 @@ options {
        query-source address 10.53.0.3;
        notify-source 10.53.0.3;
        transfer-source 10.53.0.3;
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.3; };
        listen-on-v6 { none; };

diff --git a/bin/tests/system/dialup/setup.sh b/bin/tests/system/dialup/setup.sh
new file mode 100644 (file)
index 0000000..dad3589
--- /dev/null
+++ b/bin/tests/system/dialup/setup.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# 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 https://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+# shellcheck source=conf.sh
+. ../conf.sh
+
+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/dialup/tests.sh b/bin/tests/system/dialup/tests.sh
index 2387ce3aab5a46e788543263ce16deb9be14c1e1..1353569f2ffca8f6459c266cc1b732ade78e0ccd 100644 (file)
--- a/bin/tests/system/dialup/tests.sh
+++ b/bin/tests/system/dialup/tests.sh
@@ -18,7 +18,7 @@ status=0
 
 rm -f dig.out.*
 
-DIGOPTS="+norec +tcp +noadd +nosea +nostat +noquest +nocmd -p 5300"
+DIGOPTS="+norec +tcp +noadd +nosea +nostat +noquest +nocmd -p ${PORT}"
 
 # Check the example. domain
 

diff --git a/bin/tests/system/dupsigs/tests.sh b/bin/tests/system/dupsigs/tests.sh
index f7a63cad97ea0e8bc039c2127a1bfcb36be60513..d529cfa64a7978c6d8fa42cb90dfa0d23dded6cf 100644 (file)
--- a/bin/tests/system/dupsigs/tests.sh
+++ b/bin/tests/system/dupsigs/tests.sh
@@ -21,7 +21,7 @@ do
        et=`expr $now - $start`
        echo "=============== $et ============"
        $JOURNALPRINT ns1/signing.test.db.signed.jnl | $PERL check_journal.pl
-       $DIG axfr signing.test -p 5300 @10.53.0.1 > dig.out.at$et
+       $DIG axfr signing.test -p ${PORT} @10.53.0.1 > dig.out.at$et
        awk '$4 == "RRSIG" { print $11 }' dig.out.at$et | sort | uniq -c
        lines=`awk '$4 == "RRSIG" { print}' dig.out.at$et | wc -l`
        if [ ${et} -ne 0 -a ${lines} -ne 4009 ]

diff --git a/bin/tests/system/rrl/broken.conf b/bin/tests/system/rrl/broken.conf.in
similarity index 91%
rename from bin/tests/system/rrl/broken.conf
rename to bin/tests/system/rrl/broken.conf.in
index bf98736ee5dbd7028ac5e23aa951eeff155f98dc..020542cfe74d0b3200027d7ab51628a9bd8db208 100644 (file)
--- a/bin/tests/system/rrl/broken.conf
+++ b/bin/tests/system/rrl/broken.conf.in
@@ -17,7 +17,7 @@ options {
        query-source address 10.53.0.5;
        notify-source 10.53.0.5;
        transfer-source 10.53.0.5;
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        statistics-file "named.stats";
        listen-on { 10.53.0.5; };
@@ -41,6 +41,6 @@ key rndc_key {
        algorithm hmac-sha256;
 };
 controls {
-       inet 10.53.0.5 port 9953 allow { any; } keys { rndc_key; };
+       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 abb10bd7449605b9d824c982259e0770aa2e58a9..5709d9f7fdc87a113c01f6f48580ed0f3a0564ea 100644 (file)
--- a/bin/tests/system/rrl/clean.sh
+++ b/bin/tests/system/rrl/clean.sh
@@ -16,5 +16,6 @@ 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 064230aa46c5c74c78d5dd672b503877d931cf83..be63ed9225c21baaa5cece96acb6239c3b7dd558 100644 (file)
--- a/bin/tests/system/rrl/setup.sh
+++ b/bin/tests/system/rrl/setup.sh
@@ -16,6 +16,7 @@ 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