From: Martin Schwenke <mschwenke@ddn.com>
Date: Wed, 4 Sep 2024 10:10:43 +0000 (+1000)
Subject: ctdb-tests: Add missing quotes in test output
X-Git-Tag: tdb-1.4.13~1012
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18b0ea3e9aa5ba075e415288b66387243dc5c365;p=thirdparty%2Fsamba.git

ctdb-tests: Add missing quotes in test output

These should have caused test failure since commit
ef921bdbdbacecf39ee2a1851f16dbba62175fcc.  However, the test failure
occurred in a sub-shell, which covered the failure.  So, add an error
exit if the sub-shell fails.

While here, add an error exit for another potential uncaught
sub-shell-related failure in a related test.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Anoop C S <anoopcs@samba.org>
---

diff --git a/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.015.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.015.sh
index 742cfd436d7..e1d0c3050a4 100755
--- a/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.015.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.015.sh
@@ -17,12 +17,12 @@ ctdb_get_1_public_address |
     ok <<EOF
 WARNING: Failed to delete policy routing rule
   Command "ip rule del from $ip pref $CTDB_PER_IP_ROUTING_RULE_PREF table ctdb.$ip" failed:
-  Error: argument ctdb.$ip is wrong: invalid table ID
-  Error: argument ctdb.$ip is wrong: table id value is invalid
+  Error: argument "ctdb.$ip" is wrong: invalid table ID
+  Error: argument "ctdb.$ip" is wrong: table id value is invalid
 EOF
 
     simple_test_event "releaseip" $dev $ip $bits
-}
+} || exit $?
 
 
 # there should be no routes
diff --git a/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.024.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.024.sh
index 7b1af3705aa..45b6df1d00b 100755
--- a/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.024.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.024.sh
@@ -22,7 +22,7 @@ ctdb_get_1_public_address | {
 Removing ip rule for public address ${ip} for routing table ctdb.${ip}
 EOF
 	simple_test_event "shutdown"
-}
+} || exit $?
 
 ok_null
 simple_test_command diff -u "$_rt_orig" "$_rt_tables"