adjust style, match test to other tests

bin/python/isc/coverage.py.in

@@ -188,8 +188,8 @@ 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] if len(x) > 1 and x[-1] == '.' else x
+    # 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

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

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

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=$?
@@ -81,17 +81,5 @@ for dir in [0-9][0-9]-*; do
         status=`expr $status + $ret`
 done
 
-dir=dotted-dotless
-[ -d $dir ] || mkdir $dir
-echo_i "$dir"
-zsk1=`$KEYGEN -q -K $dir -a rsasha256 one.example`
-zsk2=`$KEYGEN -q -K $dir -a rsasha256 two.example`
-$COVERAGE -K $dir one.example. two.example > coverage.$n 2>&1
-grep one.example coverage.$n >/dev/null 2>&1 || ret=1
-grep two.example coverage.$n >/dev/null 2>&1 || ret=1
-n=`expr $n + 1`
-if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
-
 echo_i "exit status: $status"
 [ $status -eq 0 ] || exit 1

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