Unit tests mock of LIB_FUNC_STRINGCONTAIN - SC2295 Expansions inside …

…${..} need to be quoted separately (#156)
SAP · May 25, 2024 · 279d43f · 279d43f
1 parent b7c703f
commit 279d43f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/scripts/tests/check/1260_cpu_smthreading_ibmpower_test.sh b/scripts/tests/check/1260_cpu_smthreading_ibmpower_test.sh
@@ -7,9 +7,7 @@ readonly PROGRAM_DIR
 #mock PREREQUISITE functions
 LIB_FUNC_IS_IBMPOWER() { return 0 ; }
 
-LIB_FUNC_STRINGCONTAIN() {
-    [[ -z "${1##*"$2"*}" ]] && [[ -z "$2" || -n "$1" ]];
-}
+LIB_FUNC_STRINGCONTAIN() { [[ -z "${1##*"$2"*}" ]] && [[ -z "$2" || -n "$1" ]]; }
 
 # still to mock for tests
 # LIB_PLATF_CPU_SOCKETS=

diff --git a/scripts/tests/check/4150_pmem_xfs_mountoption_test.sh b/scripts/tests/check/4150_pmem_xfs_mountoption_test.sh
@@ -5,7 +5,7 @@ PROGRAM_DIR="$( cd "${BASH_SOURCE[0]%/*}" && pwd )"
 readonly PROGRAM_DIR
 
 #mock PREREQUISITE functions
-LIB_FUNC_STRINGCONTAIN() { [[ -z "${1##*$2*}" ]] && [[ -z "$2" || -n "$1" ]]; }
+LIB_FUNC_STRINGCONTAIN() { [[ -z "${1##*"$2"*}" ]] && [[ -z "$2" || -n "$1" ]]; }
 
 grep() {
 

diff --git a/scripts/tests/check/5010_io_scheduler_blockdevices_test.sh b/scripts/tests/check/5010_io_scheduler_blockdevices_test.sh
@@ -13,7 +13,7 @@ LIB_FUNC_IS_VIRT_XEN() { return 1 ; }
 LIB_FUNC_IS_SLES() { return 0 ; }
 LIB_FUNC_IS_RHEL() { return 1 ; }
 
-LIB_FUNC_STRINGCONTAIN() { [[ -z "${1##*$2*}" ]] && [[ -z "$2" || -n "$1" ]]; }
+LIB_FUNC_STRINGCONTAIN() { [[ -z "${1##*"$2"*}" ]] && [[ -z "$2" || -n "$1" ]]; }
 
 # still to mock for tests
 # grep '/sys/block/sd*/queue/scheduler'

diff --git a/scripts/tests/check/5521_nfs_mount_rwsize_azure_test.sh b/scripts/tests/check/5521_nfs_mount_rwsize_azure_test.sh
@@ -6,7 +6,7 @@ readonly PROGRAM_DIR
 
 #mock PREREQUISITE functions
 LIB_FUNC_IS_CLOUD_MICROSOFT() { return 0 ; }
-LIB_FUNC_STRINGCONTAIN() { [[ -z "${1##*$2*}" ]] && [[ -z "$2" || -n "$1" ]]; }
+LIB_FUNC_STRINGCONTAIN() { [[ -z "${1##*"$2"*}" ]] && [[ -z "$2" || -n "$1" ]]; }
 
 grep() {
 

diff --git a/scripts/tests/check/5522_nfs_mount_rwsize_amazon_test.sh b/scripts/tests/check/5522_nfs_mount_rwsize_amazon_test.sh
@@ -6,7 +6,7 @@ readonly PROGRAM_DIR
 
 #mock PREREQUISITE functions
 LIB_FUNC_IS_CLOUD_AMAZON() { return 0 ; }
-LIB_FUNC_STRINGCONTAIN() { [[ -z "${1##*$2*}" ]] && [[ -z "$2" || -n "$1" ]]; }
+LIB_FUNC_STRINGCONTAIN() { [[ -z "${1##*"$2"*}" ]] && [[ -z "$2" || -n "$1" ]]; }
 
 grep() {
 

diff --git a/scripts/tests/check/5530_nfs_mount_nconnect_test.sh b/scripts/tests/check/5530_nfs_mount_nconnect_test.sh
@@ -5,7 +5,7 @@ PROGRAM_DIR="$( cd "${BASH_SOURCE[0]%/*}" && pwd )"
 readonly PROGRAM_DIR
 
 #mock PREREQUISITE functions
-LIB_FUNC_STRINGCONTAIN() { [[ -z "${1##*$2*}" ]] && [[ -z "$2" || -n "$1" ]]; }
+LIB_FUNC_STRINGCONTAIN() { [[ -z "${1##*"$2"*}" ]] && [[ -z "$2" || -n "$1" ]]; }
 
 LIB_FUNC_IS_SLES() { return 1 ; }
 LIB_FUNC_IS_RHEL() { return 1 ; }