From: Martin Schwenke <mschwenke@ddn.com>
Date: Fri, 17 Mar 2023 00:05:19 +0000 (+1100)
Subject: ctdb-tests: Enhance timeout stub
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=902258569072a24c7c973df9d8d65269694afb18;p=thirdparty%2Fsamba.git

ctdb-tests: Enhance timeout stub

Allow it to trigger on a particular command instead of
unconditionally.  Wrap setting and clearing the variable.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tests/UNIT/eventscripts/50.samba.monitor.112.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.112.sh
index f71447206f2..0e240a37615 100755
--- a/ctdb/tests/UNIT/eventscripts/50.samba.monitor.112.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.112.sh
@@ -6,7 +6,7 @@ define_test "testparm times out"
 
 setup
 
-export FAKE_TIMEOUT="yes"
+timeout_trigger "yes"
 required_result 1 <<EOF
 ERROR: smb.conf cache create failed - testparm command timed out
 EOF
diff --git a/ctdb/tests/UNIT/eventscripts/50.samba.monitor.113.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.113.sh
index faadda1a0b1..c5f741932ff 100755
--- a/ctdb/tests/UNIT/eventscripts/50.samba.monitor.113.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.113.sh
@@ -9,7 +9,7 @@ setup
 ok_null
 simple_test
 
-export FAKE_TIMEOUT="yes"
+timeout_trigger "yes"
 ok <<EOF
 WARNING: smb.conf cache update timed out - using old cache file
 EOF
diff --git a/ctdb/tests/UNIT/eventscripts/scripts/local.sh b/ctdb/tests/UNIT/eventscripts/scripts/local.sh
index 3f335ac1d16..e713d432c60 100644
--- a/ctdb/tests/UNIT/eventscripts/scripts/local.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/local.sh
@@ -253,6 +253,17 @@ ipv4_host_addr_to_net()
 	echo "${_net}/${_maskbits}"
 }
 
+# Cause the timeout stub to fail.
+timeout_trigger()
+{
+	export FAKE_TIMEOUT="$*"
+}
+
+timeout_clear()
+{
+	unset FAKE_TIMEOUT
+}
+
 ######################################################################
 
 # CTDB fakery
diff --git a/ctdb/tests/UNIT/eventscripts/stubs/timeout b/ctdb/tests/UNIT/eventscripts/stubs/timeout
index 26132eebd7c..077c23ecd3c 100755
--- a/ctdb/tests/UNIT/eventscripts/stubs/timeout
+++ b/ctdb/tests/UNIT/eventscripts/stubs/timeout
@@ -1,8 +1,10 @@
 #!/bin/sh
 
-if [ -n "$FAKE_TIMEOUT" ]; then
+# Throw away the timeout argument
+shift
+
+if [ "$FAKE_TIMEOUT" = "yes" ] || [ "$FAKE_TIMEOUT" = "$*" ]; then
 	exit 124
 else
-	shift 1
 	exec "$@"
 fi