Merge branch 'each-dnssec-coverage-dots' into 'master'

dnssec-coverage was improperly ignoring some zones

See merge request isc-projects/bind9!1487

CHANGES

@@ -1,3 +1,7 @@
+5159.	[bug]		dnssec-coverage was incorrectly ignoring
+			names specified on the command line without
+			trailing dots. [GL !1478]
+
 5158.	[protocol]	Add support for ATMRELAY and ZONEMD. [GL #867]
 
 5157.	[bug]		Nslookup now errors out if there are extra command

bin/python/isc/coverage.py.in

@@ -188,8 +188,9 @@ def parse_args():
     if args.filename and len(args.zone) > 1:
         fatal("ERROR: -f can only be used with one zone.")
 
-    # strip trailing dots
-    args.zone = [x[:-1] for x in args.zone if len(x) > 1 and x[-1] == '.']
+    # strip trailing dots if any
+    args.zone = [x[:-1] if (len(x) > 1 and x[-1] == '.') else x
+                        for x in args.zone]
 
     # convert from time arguments to seconds
     try:

bin/tests/system/coverage/13-dotted-dotless/expect

@@ -0,0 +1,7 @@
+args="-z -m2h"
+warn=0
+error=0
+ok=2
+retcode=0
+match=
+zones="one.example. two.example"

bin/tests/system/coverage/clean.sh

@@ -13,4 +13,5 @@ rm -f named-compilezone
 rm -f */K*.key
 rm -f */K*.private
 rm -rf coverage.*
+rm -rf dotted-dotless
 rm -f ns*/named.lock

bin/tests/system/coverage/setup.sh

@@ -132,3 +132,8 @@ ksk1=`$KEYGEN -q -K $dir -a rsasha1 -3fk example.com`
 dir=12-ksk-deletion
 ksk1=`$KEYGEN -q -K $dir -f KSK -a 8 -b 2048 -I +40d -D +40d example.com`
 ksk2=`$KEYGEN -q -K $dir -S $ksk1.key example.com`
+
+# Test 13: check names with/without dots at the end
+dir=13-dotted-dotless
+zsk1=`$KEYGEN -q -K $dir -a rsasha256 one.example`
+zsk2=`$KEYGEN -q -K $dir -a rsasha256 two.example`

bin/tests/system/coverage/tests.sh

@@ -32,9 +32,9 @@ ret=0
 for dir in [0-9][0-9]-*; do
         ret=0
         echo_i "$dir"
-        args= warn= error= ok= retcode= match=
+        args= warn= error= ok= retcode= match= zones=
         . $dir/expect
-        $COVERAGE $args -K $dir example.com > coverage.$n 2>&1
+        $COVERAGE $args -K $dir ${zones:-example.com} > coverage.$n 2>&1
 
         # check that return code matches expectations
         found=$?

util/copyrights

@@ -482,6 +482,7 @@
 ./bin/tests/system/coverage/11-cutoff/README	X	2014,2018,2019
 ./bin/tests/system/coverage/11-cutoff/expect	X	2014,2018,2019
 ./bin/tests/system/coverage/12-ksk-deletion/expect	X	2018,2019
+./bin/tests/system/coverage/13-dotted-dotless/expect	X	2019
 ./bin/tests/system/coverage/clean.sh		SH	2013,2014,2016,2018,2019
 ./bin/tests/system/coverage/setup.sh		SH	2013,2014,2016,2017,2018,2019
 ./bin/tests/system/coverage/tests.sh		SH	2013,2014,2016,2018,2019