From: Aram Sargsyan <aram@isc.org>
Date: Wed, 7 May 2025 13:34:04 +0000 (+0000)
Subject: Fix more catz system test errors
X-Git-Tag: v9.21.9~46^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52ac03f0643cbc85493ca43c717a2c8dde080db8;p=thirdparty%2Fbind9.git

Fix more catz system test errors

A quick grep check discovered a couple of more errors similar to the
one fixed in the previous commit. Fix them too.
---

diff --git a/bin/tests/system/catz/tests.sh b/bin/tests/system/catz/tests.sh
index 576436886cd..2dd89ff7f88 100644
--- a/bin/tests/system/catz/tests.sh
+++ b/bin/tests/system/catz/tests.sh
@@ -85,8 +85,8 @@ n=0
 n=$((n + 1))
 echo_i "checking that catalog-bad1.example (with no version) has failed to load ($n)"
 ret=0
-wait_for_message ns2/named.run "catz: zone 'catalog-bad1.example' has no 'version' record and will not be processed" \
-  && if [ $ret -ne 0 ]; then echo_i "failed"; fi
+wait_for_message ns2/named.run "catz: zone 'catalog-bad1.example' has no 'version' record (partial match) and will not be processed" || ret=1
+if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 n=$((n + 1))
@@ -851,8 +851,8 @@ status=$((status + ret))
 n=$((n + 1))
 echo_i "waiting for secondary to sync up ($n)"
 ret=0
-wait_for_message ns2/named.run "catz: adding zone 'dom-existing-forward-off.example' from catalog 'catalog1.example'" \
-  && if [ $ret -ne 0 ]; then echo_i "failed"; fi
+wait_for_message ns2/named.run "catz: adding zone 'dom-existing-forward-off.example' from catalog 'catalog1.example'" || ret=1
+if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 n=$((n + 1))