From: Andreas Schneider Date: Fri, 22 Apr 2022 13:34:09 +0000 (+0200) Subject: s3:tests: Reformat test_forceuser_validusers.sh X-Git-Tag: talloc-2.3.4~246 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cda4db7d593430e33ca34432ea80485bc7dae2c2;p=thirdparty%2Fsamba.git s3:tests: Reformat test_forceuser_validusers.sh shfmt -f source3/script/| xargs shfmt -w -p -i 0 -fn Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Thu May 5 11:53:51 UTC 2022 on sn-devel-184 --- diff --git a/source3/script/tests/test_forceuser_validusers.sh b/source3/script/tests/test_forceuser_validusers.sh index d9150c95a67..6ee0515f89a 100755 --- a/source3/script/tests/test_forceuser_validusers.sh +++ b/source3/script/tests/test_forceuser_validusers.sh @@ -4,10 +4,10 @@ # if [ $# -lt 6 ]; then -cat < EOF -exit 1; + exit 1 fi SERVER="$1" @@ -21,17 +21,17 @@ shift 6 ADDARGS="$*" failed=0 - -incdir=`dirname $0`/../../../testprogs/blackbox +incdir=$(dirname $0)/../../../testprogs/blackbox . $incdir/subunit.sh cd $SELFTEST_TMPDIR || exit 1 -run_cmd_nooutput() { +run_cmd_nooutput() +{ CMD="$1" - out=`eval ${CMD} > TESTOUT 2>&1` - if [ $? != 0 ] ; then + out=$(eval ${CMD} >TESTOUT 2>&1) + if [ $? != 0 ]; then cat TESTOUT rm -f TESTOUT echo "command failed" @@ -52,7 +52,7 @@ test_force_user_valid_users() # Test testit "force user not works when combined with valid users" \ - test_force_user_valid_users || failed=`expr $failed + 1` + test_force_user_valid_users || failed=$(expr $failed + 1) # Cleanup