From: Martin Schwenke <mschwenke@ddn.com>
Date: Tue, 4 Jul 2023 00:30:05 +0000 (+1000)
Subject: ctdb-tests: Avoid ShellCheck warning SC2059
X-Git-Tag: talloc-2.4.1~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a45a76fd19ce486049583e1e7435320be40f9ef9;p=thirdparty%2Fsamba.git

ctdb-tests: Avoid ShellCheck warning SC2059

  SC2059 (info): Don't use variables in the printf format string. Use printf '..%s..' "$foo".

Move the format string to the function and just parameterise the share
type.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/ctdb/tests/UNIT/eventscripts/50.samba.monitor.105.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.105.sh
index 1f2fa1e9068..7208aca5eae 100755
--- a/ctdb/tests/UNIT/eventscripts/50.samba.monitor.105.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.105.sh
@@ -6,7 +6,7 @@ define_test "non-existent share path"
 
 setup
 
-out=$(shares_missing "ERROR: samba directory \"%s\" not available" 2)
+out=$(shares_missing "samba" 2)
 
 required_result 1 "$out"
 simple_test
diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.161.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.161.sh
index ed080c2c4c8..1fa73bb8f91 100755
--- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.161.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.161.sh
@@ -6,7 +6,7 @@ define_test "2nd share missing"
 
 setup
 
-out=$(shares_missing "ERROR: nfs directory \"%s\" not available" 2)
+out=$(shares_missing "nfs" 2)
 
 required_result 1 "$out"
 simple_test
diff --git a/ctdb/tests/UNIT/eventscripts/scripts/local.sh b/ctdb/tests/UNIT/eventscripts/scripts/local.sh
index 72c43bd7ee7..84d0f355218 100644
--- a/ctdb/tests/UNIT/eventscripts/scripts/local.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/local.sh
@@ -171,7 +171,7 @@ setup_shares()
 shares_missing()
 {
 	# Mark some shares as non-existent
-	_fmt="$1"
+	_type="$1"
 	shift
 
 	_out=""
@@ -187,7 +187,8 @@ shares_missing()
 
 			debug "Mark share $_n as missing share \"$_i\""
 			rmdir "$_i"
-			_t=$(printf "$_fmt" "${_i}")
+			_t=$(printf "ERROR: %s directory \"%s\" not available" \
+				    "$_type" "${_i}")
 			_out="${_out}${_out:+${_nl}}${_t}"
 		done
 		_n=$(($_n + 1))