From: Matthijs Mekking <matthijs@isc.org>
Date: Tue, 27 Jun 2023 14:27:35 +0000 (+0200)
Subject: Check all keys despite early failure
X-Git-Tag: v9.19.15~5^2~1
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=674249f66a5c41d6742aebb2461ba0659c01eee7;p=thirdparty%2Fbind9.git

Check all keys despite early failure

In the kasp script, if one expected key is not found, continue checking
the other key ids, even if there is no match for the first one.  This
provides a bit more information which keys mismatch and makes for
easier debugging test failures.
---

diff --git a/bin/tests/system/kasp.sh b/bin/tests/system/kasp.sh
index e120dcd95ce..560ad22eba3 100644
--- a/bin/tests/system/kasp.sh
+++ b/bin/tests/system/kasp.sh
@@ -728,6 +728,7 @@ check_numkeys() {
 
 _check_keys() {
 	ret=0
+	_ret=0
 
 	# Clear key ids.
 	key_set KEY1 ID "no"
@@ -770,10 +771,10 @@ _check_keys() {
 
 		# If ret is still non-zero, none of the files matched.
 		echo_i "failed"
-		return 1
+		_ret=1
 	done
 
-	return 0
+	return $_ret
 }
 
 # Check keys for a configured zone. This verifies: