From: Tom Krizek <tkrizek@isc.org>
Date: Thu, 22 Jun 2023 15:57:22 +0000 (+0200)
Subject: Check for proper log message in kasp test
X-Git-Tag: v9.16.43~17^2~1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=9cfc8da4878e761aa435fee80d6b5c93fda11365;p=thirdparty%2Fbind9.git

Check for proper log message in kasp test

The log message is supposed to contain the zone name which was
erroneously omitted, but didn't pop up during tests, since return code
was silently ignored.

Now it actually waits for the proper log message rather than being an
equivalent of 3 second sleep (which was also sufficient to make the test
pass, thus we detected no failure).

(cherry picked from commit 1dd4c2b9e2649f8dc41335e15180c0dc5ad4efbb)
---

diff --git a/bin/tests/system/kasp/tests.sh b/bin/tests/system/kasp/tests.sh
index c2bf7e95e62..fbb8bdc215b 100644
--- a/bin/tests/system/kasp/tests.sh
+++ b/bin/tests/system/kasp/tests.sh
@@ -329,7 +329,7 @@ ret=0
 
 nextpart $DIR/named.run > /dev/null
 rndccmd 10.53.0.3 loadkeys "$ZONE" > /dev/null || log_error "rndc loadkeys zone ${ZONE} failed"
-wait_for_log 3 "keymgr: done" $DIR/named.run
+wait_for_log 3 "keymgr: $ZONE done" $DIR/named.run
 privkey_stat2=$(key_stat "${basefile}.private")
 pubkey_stat2=$(key_stat "${basefile}.key")
 state_stat2=$(key_stat "${basefile}.state")