s3:tests: Reformat test_testparm_s3.sh

shfmt -f source3/script/| xargs shfmt -w -p -i 0 -fn Signed-off-by: Andreas Schneider <[email protected]> Reviewed-by: Guenther Deschner <[email protected]>
nrensen · Jun 22, 2022 · a7fe9b5 · a7fe9b5
1 parent 7897bc8
commit a7fe9b5
Showing 1 changed file with 61 additions and 62 deletions.
diff --git a/source3/script/tests/test_testparm_s3.sh b/source3/script/tests/test_testparm_s3.sh
@@ -6,18 +6,18 @@
 # and the macro expansions.
 
 if [ $# -lt 1 ]; then
-cat <<EOF
+	cat <<EOF
 Usage: test_net_registry_roundtrip.sh LOCAL_PATH
 EOF
-exit 1;
+	exit 1
 fi
 
 LOCAL_PATH="$1"
 
 TEMP_CONFFILE=${LOCAL_PATH}/smb.conf.tmp
 TESTPARM="$VALGRIND ${TESTPARM:-$BINDIR/testparm} --suppress-prompt --skip-logic-checks"
 
-incdir=`dirname $0`/../../../testprogs/blackbox
+incdir=$(dirname $0)/../../../testprogs/blackbox
 . $incdir/subunit.sh
 
 failed=0
@@ -26,7 +26,7 @@ test_include_expand_macro()
 {
 	MACRO=$1
 	rm -f ${TEMP_CONFFILE}
-	cat >${TEMP_CONFFILE}<<EOF
+	cat >${TEMP_CONFFILE} <<EOF
 [global]
 	include = ${TEMP_CONFFILE}.%${MACRO}
 EOF
@@ -37,7 +37,7 @@ test_one_global_option()
 {
 	OPTION="$@"
 	rm -f ${TEMP_CONFFILE}
-	cat > ${TEMP_CONFFILE}<<EOF
+	cat >${TEMP_CONFFILE} <<EOF
 [global]
 	${OPTION}
 EOF
@@ -47,7 +47,7 @@ EOF
 test_copy()
 {
 	rm -f ${TEMP_CONFFILE}
-	cat > ${TEMP_CONFFILE}<<EOF
+	cat >${TEMP_CONFFILE} <<EOF
 [share1]
 	path = /tmp
 	read only = no
@@ -60,92 +60,91 @@ EOF
 
 test_testparm_deprecated()
 {
-    name=$1
-    old_SAMBA_DEPRECATED_SUPPRESS=$SAMBA_DEPRECATED_SUPPRESS
-    SAMBA_DEPRECATED_SUPPRESS=
-    export SAMBA_DEPRECATED_SUPPRESS
-    testit_grep $name 'WARNING: The "lsaovernetlogon" option is deprecated' $VALGRIND ${TESTPARM} ${TEMP_CONFFILE} --option='lsaovernetlogon=true'
-    SAMBA_DEPRECATED_SUPPRESS=$old_SAMBA_DEPRECATED_SUPPRESS
-    export SAMBA_DEPRECATED_SUPPRESS
+	name=$1
+	old_SAMBA_DEPRECATED_SUPPRESS=$SAMBA_DEPRECATED_SUPPRESS
+	SAMBA_DEPRECATED_SUPPRESS=
+	export SAMBA_DEPRECATED_SUPPRESS
+	testit_grep $name 'WARNING: The "lsaovernetlogon" option is deprecated' $VALGRIND ${TESTPARM} ${TEMP_CONFFILE} --option='lsaovernetlogon=true'
+	SAMBA_DEPRECATED_SUPPRESS=$old_SAMBA_DEPRECATED_SUPPRESS
+	export SAMBA_DEPRECATED_SUPPRESS
 }
 
 test_testparm_deprecated_suppress()
 {
-    name=$1
-    subunit_start_test "$name"
-    output=$(SAMBA_DEPRECATED_SUPPRESS=1 $VALGRIND ${TESTPARM} ${TEMP_CONFFILE} --option='lsa over netlogon = true' 2>&1)
-    status=$?
-    if [ "$status" = "0" ]; then
-       echo "$output" | grep --quiet 'WARNING: The "lsa over netlogon " option is deprecated'
-       status=$?
-       if [ "$status" = "1" ]; then
-           subunit_pass_test "$name"
-       else
-           echo $output | subunit_fail_test "$name"
-       fi
-    else
-       echo $output | subunit_fail_test "$name"
-    fi
+	name=$1
+	subunit_start_test "$name"
+	output=$(SAMBA_DEPRECATED_SUPPRESS=1 $VALGRIND ${TESTPARM} ${TEMP_CONFFILE} --option='lsa over netlogon = true' 2>&1)
+	status=$?
+	if [ "$status" = "0" ]; then
+		echo "$output" | grep --quiet 'WARNING: The "lsa over netlogon " option is deprecated'
+		status=$?
+		if [ "$status" = "1" ]; then
+			subunit_pass_test "$name"
+		else
+			echo $output | subunit_fail_test "$name"
+		fi
+	else
+		echo $output | subunit_fail_test "$name"
+	fi
 }
 
-testit "name resolve order = lmhosts wins host bcast"\
-	test_one_global_option "name resolve order = lmhosts wins host bcast" || \
-	failed=`expr ${failed} + 1`
+testit "name resolve order = lmhosts wins host bcast" \
+	test_one_global_option "name resolve order = lmhosts wins host bcast" ||
+	failed=$(expr ${failed} + 1)
 
-testit_expect_failure "name resolve order = bad wins host bcast"\
-	test_one_global_option "name resolve order = bad wins host bcast" || \
-	failed=`expr ${failed} + 1`
+testit_expect_failure "name resolve order = bad wins host bcast" \
+	test_one_global_option "name resolve order = bad wins host bcast" ||
+	failed=$(expr ${failed} + 1)
 
-testit_expect_failure "name resolve order = lmhosts bad host bcast"\
-	test_one_global_option "name resolve order = lmhosts bad host bcast" || \
-	failed=`expr ${failed} + 1`
+testit_expect_failure "name resolve order = lmhosts bad host bcast" \
+	test_one_global_option "name resolve order = lmhosts bad host bcast" ||
+	failed=$(expr ${failed} + 1)
 
-testit_expect_failure "name resolve order = lmhosts wins bad bcast"\
-	test_one_global_option "name resolve order = lmhosts wins bad bcast" || \
-	failed=`expr ${failed} + 1`
+testit_expect_failure "name resolve order = lmhosts wins bad bcast" \
+	test_one_global_option "name resolve order = lmhosts wins bad bcast" ||
+	failed=$(expr ${failed} + 1)
 
-testit_expect_failure "name resolve order = lmhosts wins host bad"\
-	test_one_global_option "name resolve order = lmhosts wins host bad" || \
-	failed=`expr ${failed} + 1`
+testit_expect_failure "name resolve order = lmhosts wins host bad" \
+	test_one_global_option "name resolve order = lmhosts wins host bad" ||
+	failed=$(expr ${failed} + 1)
 
 testit "netbios name" \
-	test_one_global_option "netbios name = funky" || \
-	failed=`expr ${failed} + 1`
+	test_one_global_option "netbios name = funky" ||
+	failed=$(expr ${failed} + 1)
 
 testit "netbios aliases" \
-	test_one_global_option "netbios aliases = funky1 funky2 funky3" || \
-	failed=`expr ${failed} + 1`
+	test_one_global_option "netbios aliases = funky1 funky2 funky3" ||
+	failed=$(expr ${failed} + 1)
 
 testit "netbios scope" \
-	test_one_global_option "netbios scope = abc" || \
-	failed=`expr ${failed} + 1`
+	test_one_global_option "netbios scope = abc" ||
+	failed=$(expr ${failed} + 1)
 
 testit "workgroup" \
-	test_one_global_option "workgroup = samba" || \
-	failed=`expr ${failed} + 1`
+	test_one_global_option "workgroup = samba" ||
+	failed=$(expr ${failed} + 1)
 
 testit "display charset" \
-	test_one_global_option "display charset = UTF8" || \
-	failed=`expr ${failed} + 1`
+	test_one_global_option "display charset = UTF8" ||
+	failed=$(expr ${failed} + 1)
 
 testit "ldap debug level" \
-	test_one_global_option "ldap debug level = 7" || \
-	failed=`expr ${failed} + 1`
+	test_one_global_option "ldap debug level = 7" ||
+	failed=$(expr ${failed} + 1)
 
-for LETTER in U G D I i L N M R T a d h m v w V ; do
-testit "include with %${LETTER} macro expansion" \
-	test_include_expand_macro "${LETTER}" || \
-	failed=`expr ${failed} + 1`
+for LETTER in U G D I i L N M R T a d h m v w V; do
+	testit "include with %${LETTER} macro expansion" \
+		test_include_expand_macro "${LETTER}" ||
+		failed=$(expr ${failed} + 1)
 done
 
 testit "copy" \
-	test_copy || \
-	failed=`expr ${failed} + 1`
+	test_copy ||
+	failed=$(expr ${failed} + 1)
 
 test_testparm_deprecated "test_deprecated_warning_printed"
 test_testparm_deprecated_suppress "test_deprecated_warning_suppressed"
 
 rm -f ${TEMP_CONFFILE}
 
 testok $0 ${failed}
-