[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  250947611c7 ctdb-tests: Fix test failure when tests are installed
       via  18b0ea3e9aa ctdb-tests: Add missing quotes in test output
      from  e819d55c4c8 utils: Fix up 14a533680245

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 250947611c75084d12f09e325dc27cd76b91e9b3
Author: Martin Schwenke <mschwenke at ddn.com>
Date:   Wed Sep 4 20:20:20 2024 +1000

    ctdb-tests: Fix test failure when tests are installed
    
    This currently works when tests are run in-tree.
    
    However, when installed, use of an incorrect variable means it fails
    to find statd_callout in the tests/ subdirectory.  Switch to using the
    correct variable.
    
    Signed-off-by: Martin Schwenke <mschwenke at ddn.com>
    Reviewed-by: Anoop C S <anoopcs at samba.org>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Sun Oct  6 11:07:05 UTC 2024 on atb-devel-224

commit 18b0ea3e9aa5ba075e415288b66387243dc5c365
Author: Martin Schwenke <mschwenke at ddn.com>
Date:   Wed Sep 4 20:10:43 2024 +1000

    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 at ddn.com>
    Reviewed-by: Anoop C S <anoopcs at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 ctdb/tests/UNIT/eventscripts/13.per_ip_routing.015.sh | 6 +++---
 ctdb/tests/UNIT/eventscripts/13.per_ip_routing.024.sh | 2 +-
 ctdb/tests/UNIT/eventscripts/scripts/statd-callout.sh | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

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"
diff --git a/ctdb/tests/UNIT/eventscripts/scripts/statd-callout.sh b/ctdb/tests/UNIT/eventscripts/scripts/statd-callout.sh
index 868d4ac652c..f27d83760e1 100644
--- a/ctdb/tests/UNIT/eventscripts/scripts/statd-callout.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/statd-callout.sh
@@ -111,7 +111,7 @@ EOF
 
 	case "$event" in
 	add-client | del-client)
-		cmd="${CTDB_SCRIPTS_TESTS_LIBEXEC_DIR}/statd_callout"
+		cmd="${CTDB_SCRIPTS_HELPER_BINDIR}/statd_callout"
 		unit_test "$cmd" "$event" "$@"
 		;;
 	*)


-- 
Samba Shared Repository