From a7aedd5bca3bd6a0a0df4e75b66f02e96fb0af6d Mon Sep 17 00:00:00 2001 From: Matthijs Mekking Date: Thu, 28 Apr 2022 12:58:38 +0200 Subject: [PATCH] Minor fixes in kasp system test Fix two typos and two grep calls. (cherry picked from commit 2b34b326fcdb1685246f072b73f7f19416eb3b08) --- bin/tests/system/kasp.sh | 4 ++-- bin/tests/system/kasp/tests.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/tests/system/kasp.sh b/bin/tests/system/kasp.sh index 9feab32c0c..74a2345e37 100644 --- a/bin/tests/system/kasp.sh +++ b/bin/tests/system/kasp.sh @@ -1021,7 +1021,7 @@ _check_apex_dnskey() { grep "${ZONE}\..*${DNSKEY_TTL}.*IN.*DNSKEY.*${_flags}.*.3.*$(key_get KEY1 ALG_NUM)" "dig.out.$DIR.test$n" > /dev/null || return 1 _checksig=1 elif [ "$(key_get KEY1 EXPECT)" = "yes" ]; then - grep "${ZONE}\.*${DNSKEY_TTL}.*IN.*DNSKEY.*${_flags}.*.3.*$(key_get KEY1 ALG_NUM)" "dig.out.$DIR.test$n" > /dev/null && return 1 + grep "${ZONE}\..*${DNSKEY_TTL}.*IN.*DNSKEY.*${_flags}.*.3.*$(key_get KEY1 ALG_NUM)" "dig.out.$DIR.test$n" > /dev/null && return 1 fi _flags="$(key_get KEY2 FLAGS)" @@ -1030,7 +1030,7 @@ _check_apex_dnskey() { grep "${ZONE}\..*${DNSKEY_TTL}.*IN.*DNSKEY.*${_flags}.*.3.*$(key_get KEY2 ALG_NUM)" "dig.out.$DIR.test$n" > /dev/null || return 1 _checksig=1 elif [ "$(key_get KEY2 EXPECT)" = "yes" ]; then - grep "${ZONE}\.*${DNSKEY_TTL}.*IN.*DNSKEY.*${_flags}.*.3.*$(key_get KEY2 ALG_NUM)" "dig.out.$DIR.test$n" > /dev/null && return 1 + grep "${ZONE}\..*${DNSKEY_TTL}.*IN.*DNSKEY.*${_flags}.*.3.*$(key_get KEY2 ALG_NUM)" "dig.out.$DIR.test$n" > /dev/null && return 1 fi _flags="$(key_get KEY3 FLAGS)" diff --git a/bin/tests/system/kasp/tests.sh b/bin/tests/system/kasp/tests.sh index 27d4e3f500..bcea02f65d 100644 --- a/bin/tests/system/kasp/tests.sh +++ b/bin/tests/system/kasp/tests.sh @@ -2024,7 +2024,7 @@ dnssec_verify # Schedule KSK rollover now. set_policy "manual-rollover" "3" "3600" set_keystate "KEY1" "GOAL" "hidden" -# This key was activated one day agao, so lifetime is set to 1d plus +# This key was activated one day ago, so lifetime is set to 1d plus # prepublication duration (7500 seconds) = 93900 seconds. set_keylifetime "KEY1" "93900" created=$(key_get KEY1 CREATED) @@ -2051,7 +2051,7 @@ dnssec_verify # Schedule ZSK rollover now. set_policy "manual-rollover" "4" "3600" set_keystate "KEY2" "GOAL" "hidden" -# This key was activated one day agao, so lifetime is set to 1d plus +# This key was activated one day ago, so lifetime is set to 1d plus # prepublication duration (7500 seconds) = 93900 seconds. set_keylifetime "KEY2" "93900" created=$(key_get KEY2 CREATED)