]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3:tests: Reformat test_homes.sh
authorAndreas Schneider <asn@samba.org>
Fri, 22 Apr 2022 13:34:09 +0000 (15:34 +0200)
committerAndreas Schneider <asn@cryptomilk.org>
Wed, 18 May 2022 06:58:35 +0000 (06:58 +0000)
shfmt -f source3/script/| xargs shfmt -w -p -i 0 -fn

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Anoop C S <anoopcs@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
source3/script/tests/test_homes.sh

index 90e84550dbcfd538b940948c52d2a9c643fc0c95..be8e9b20d58fbaf6eb1ecbf771d9c9672f181626 100755 (executable)
@@ -17,120 +17,120 @@ SMBCLIENT="${6}"
 CONFIGURATION="${7}"
 shift 7
 
-incdir=`dirname $0`/../../../testprogs/blackbox
+incdir=$(dirname $0)/../../../testprogs/blackbox
 . $incdir/subunit.sh
 
 failed=0
 
 test_gooduser_home()
 {
-    tmpfile=$PREFIX/smbclient_homes_gooduser_commands
-    cat > $tmpfile <<EOF
+       tmpfile=$PREFIX/smbclient_homes_gooduser_commands
+       cat >$tmpfile <<EOF
 ls
 quit
 EOF
 
-    USERNAME=gooduser
-
-    cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/$USERNAME $CONFIGURATION < $tmpfile 2>&1'
-    eval echo "$cmd"
-    out=$(eval $cmd)
-    ret=$?
-    rm -f $tmpfile
-
-    if [ $ret -ne 0 ] ; then
-       echo "$out"
-       echo "failed to connect error $ret"
-       return 1
-    fi
-
-    echo "$out" | grep 'Try "help" to get a list of possible commands.'
-    ret=$?
-    if [ $ret -ne 0 ] ; then
-       echo "$out"
-       echo 'failed - should get: Try "help" to get a list of possible commands.'
-       return 1
-    fi
-
-    return 0
+       USERNAME=gooduser
+
+       cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/$USERNAME $CONFIGURATION < $tmpfile 2>&1'
+       eval echo "$cmd"
+       out=$(eval $cmd)
+       ret=$?
+       rm -f $tmpfile
+
+       if [ $ret -ne 0 ]; then
+               echo "$out"
+               echo "failed to connect error $ret"
+               return 1
+       fi
+
+       echo "$out" | grep 'Try "help" to get a list of possible commands.'
+       ret=$?
+       if [ $ret -ne 0 ]; then
+               echo "$out"
+               echo 'failed - should get: Try "help" to get a list of possible commands.'
+               return 1
+       fi
+
+       return 0
 }
 
 test_eviluser_home()
 {
-    tmpfile=$PREFIX/smbclient_homes_eviluser_commands
-    cat > $tmpfile <<EOF
+       tmpfile=$PREFIX/smbclient_homes_eviluser_commands
+       cat >$tmpfile <<EOF
 ls
 quit
 EOF
 
-    USERNAME=eviluser
-
-    cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/$USERNAME $CONFIGURATION < $tmpfile 2>&1'
-    eval echo "$cmd"
-    out=$(eval $cmd)
-    ret=$?
-    rm -f $tmpfile
-
-    if [ $ret -ne 1 ] ; then
-       echo "$out"
-       echo "The server should reject connecting ret=$ret"
-       return 1
-    fi
-
-    echo "$out" | grep 'NT_STATUS_BAD_NETWORK_NAME'
-    ret=$?
-    if [ $ret -ne 0 ] ; then
-       echo "$out"
-       echo 'failed - should get: NT_STATUS_BAD_NETWORK_NAME.'
-       return 1
-    fi
-
-    return 0
+       USERNAME=eviluser
+
+       cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/$USERNAME $CONFIGURATION < $tmpfile 2>&1'
+       eval echo "$cmd"
+       out=$(eval $cmd)
+       ret=$?
+       rm -f $tmpfile
+
+       if [ $ret -ne 1 ]; then
+               echo "$out"
+               echo "The server should reject connecting ret=$ret"
+               return 1
+       fi
+
+       echo "$out" | grep 'NT_STATUS_BAD_NETWORK_NAME'
+       ret=$?
+       if [ $ret -ne 0 ]; then
+               echo "$out"
+               echo 'failed - should get: NT_STATUS_BAD_NETWORK_NAME.'
+               return 1
+       fi
+
+       return 0
 }
 
 test_slashuser_home()
 {
-    tmpfile=$PREFIX/smbclient_homes_slashuser_commands
-    cat > $tmpfile <<EOF
+       tmpfile=$PREFIX/smbclient_homes_slashuser_commands
+       cat >$tmpfile <<EOF
 ls
 quit
 EOF
 
-    USERNAME=slashuser
-
-    cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/$USERNAME $CONFIGURATION < $tmpfile 2>&1'
-    eval echo "$cmd"
-    out=$(eval $cmd)
-    ret=$?
-    rm -f $tmpfile
-
-    if [ $ret -ne 1 ] ; then
-       echo "$out"
-       echo "The server should reject connecting ret=$ret"
-       return 1
-    fi
-
-    echo "$out" | grep 'NT_STATUS_BAD_NETWORK_NAME'
-    ret=$?
-    if [ $ret -ne 0 ] ; then
-       echo "$out"
-       echo 'failed - should get: NT_STATUS_BAD_NETWORK_NAME.'
-       return 1
-    fi
-
-    return 0
+       USERNAME=slashuser
+
+       cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/$USERNAME $CONFIGURATION < $tmpfile 2>&1'
+       eval echo "$cmd"
+       out=$(eval $cmd)
+       ret=$?
+       rm -f $tmpfile
+
+       if [ $ret -ne 1 ]; then
+               echo "$out"
+               echo "The server should reject connecting ret=$ret"
+               return 1
+       fi
+
+       echo "$out" | grep 'NT_STATUS_BAD_NETWORK_NAME'
+       ret=$?
+       if [ $ret -ne 0 ]; then
+               echo "$out"
+               echo 'failed - should get: NT_STATUS_BAD_NETWORK_NAME.'
+               return 1
+       fi
+
+       return 0
 }
 
 testit "test gooduser home" \
-    test_gooduser_home || \
-    failed=`expr $failed + 1`
+       test_gooduser_home ||
+       failed=$(expr $failed + 1)
 
 testit "test eviluser home reject" \
-    test_eviluser_home || \
-    failed=`expr $failed + 1`
+       test_eviluser_home ||
+       failed=$(expr $failed + 1)
 
 testit "test slashuser home reject" \
-    test_slashuser_home || \
-    failed=`expr $failed + 1`
+       test_slashuser_home ||
+       failed=$(expr $failed + 1)
 
 testok $0 $failed