From 756674f6d1e62e4f5eabbb71e80a25974a32783c Mon Sep 17 00:00:00 2001 From: Matthijs Mekking Date: Thu, 3 Dec 2020 09:03:21 +0100 Subject: [PATCH] Small adjustments to kasp rndc_checkds function Slightly better test output, and only call 'load keys' if the 'rndc checkds' call succeeded. --- bin/tests/system/kasp/tests.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bin/tests/system/kasp/tests.sh b/bin/tests/system/kasp/tests.sh index d22ec2660b..12b3fa9e0e 100644 --- a/bin/tests/system/kasp/tests.sh +++ b/bin/tests/system/kasp/tests.sh @@ -1256,21 +1256,23 @@ rndc_checkds() { _keycmd="" if [ "${_key}" != "-" ]; then _keyid=$(key_get $_key ID) - _keycmd="-key ${_keyid}" + _keycmd=" -key ${_keyid}" fi _whencmd="" if [ "${_when}" != "now" ]; then - _whencmd="-when ${_when}" + _whencmd=" -when ${_when}" fi n=$((n+1)) - echo_i "calling rndc dnssec -checkds ${_keycmd} ${_whencmd} ${_what} zone ${_zone} ($n)" + echo_i "calling rndc dnssec -checkds${_keycmd}${_whencmd} ${_what} zone ${_zone} in ${_view} ($n)" ret=0 - rndccmd $_server dnssec -checkds $_keycmd $_whencmd $_what $_zone in $_view > rndc.dnssec.checkds.out.$_zone.$n || log_error "rndc dnssec -checkds (${_keycmd} ${_whencmd} ${_what} zone ${_zone} failed" + rndccmd $_server dnssec -checkds $_keycmd $_whencmd $_what $_zone in $_view > rndc.dnssec.checkds.out.$_zone.$n || log_error "rndc dnssec -checkds${_keycmd}${_whencmd} ${_what} zone ${_zone} failed" - _loadkeys_on $_server $_dir $_zone || log_error "loadkeys zone ${_zone} failed ($n)" + if [ "$ret" -eq 0 ]; then + _loadkeys_on $_server $_dir $_zone || log_error "loadkeys zone ${_zone} failed ($n)" + fi test "$ret" -eq 0 || echo_i "failed" status=$((status+ret))