The branch, master has been updated
via d9e561a89a2 s3:tests: Reformat test_smbclient_s3.sh
from a6c9c86b2f4 vfs_btrfs: reduce loglevel message to DEBUG in
btrfs_fget_compression()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d9e561a89a26078cccaf279a450203d5195ff445
Author: Andreas Schneider <a...@samba.org>
Date: Fri Apr 22 15:34:11 2022 +0200
s3:tests: Reformat test_smbclient_s3.sh
shfmt -f source3/script/| xargs shfmt -w -p -i 0 -fn
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
Autobuild-Date(master): Wed Jun 15 06:54:49 UTC 2022 on sn-devel-184
-----------------------------------------------------------------------
Summary of changes:
source3/script/tests/test_smbclient_s3.sh | 3235 ++++++++++++++---------------
1 file changed, 1616 insertions(+), 1619 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/script/tests/test_smbclient_s3.sh
b/source3/script/tests/test_smbclient_s3.sh
index c23f8deecb8..da4fa62a144 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -3,10 +3,10 @@
# this runs the file serving tests that are expected to pass with samba3
if [ $# -lt 13 ]; then
-cat <<EOF
+ cat <<EOF
Usage: test_smbclient_s3.sh SERVER SERVER_IP DOMAIN USERNAME PASSWORD USERID
LOCAL_PATH PREFIX SMBCLIENT WBINFO NET CONFIGURATION PROTOCOL
EOF
-exit 1;
+ exit 1
fi
SERVER="${1}"
@@ -28,7 +28,7 @@ shift 13
RAWARGS="${CONFIGURATION} -m${PROTOCOL}"
ADDARGS="${RAWARGS} $*"
-incdir=`dirname $0`/../../../testprogs/blackbox
+incdir=$(dirname $0)/../../../testprogs/blackbox
. $incdir/subunit.sh
failed=0
@@ -40,69 +40,69 @@ export SAMBA_DEPRECATED_SUPPRESS
# Test that a noninteractive smbclient does not prompt
test_noninteractive_no_prompt()
{
- prompt="smb"
+ prompt="smb"
- cmd='echo du | $SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp -I
$SERVER_IP $ADDARGS 2>&1'
- eval echo "$cmd"
- out=`eval $cmd`
+ cmd='echo du | $SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp -I
$SERVER_IP $ADDARGS 2>&1'
+ eval echo "$cmd"
+ out=$(eval $cmd)
- if [ $? != 0 ] ; then
- echo "$out"
- echo "command failed"
- return 1
- fi
+ if [ $? != 0 ]; then
+ echo "$out"
+ echo "command failed"
+ return 1
+ fi
- echo "$out" | grep $prompt >/dev/null 2>&1
+ echo "$out" | grep $prompt >/dev/null 2>&1
- if [ $? = 0 ] ; then
- # got a prompt .. fail
- echo matched interactive prompt in non-interactive mode
- return 1
- fi
+ if [ $? = 0 ]; then
+ # got a prompt .. fail
+ echo matched interactive prompt in non-interactive mode
+ return 1
+ fi
- return 0
+ return 0
}
# Test that an interactive smbclient prompts to stdout
test_interactive_prompt_stdout()
{
- prompt="smb"
- tmpfile=$PREFIX/smbclient_interactive_prompt_commands
+ prompt="smb"
+ tmpfile=$PREFIX/smbclient_interactive_prompt_commands
- cat > $tmpfile <<EOF
+ cat >$tmpfile <<EOF
du
quit
EOF
- cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT "$@" -U$USERNAME%$PASSWORD
//$SERVER/tmp -I $SERVER_IP $ADDARGS < $tmpfile 2>&1'
- eval echo "$cmd"
- out=`eval $cmd`
- ret=$?
- rm -f $tmpfile
+ cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT "$@" -U$USERNAME%$PASSWORD
//$SERVER/tmp -I $SERVER_IP $ADDARGS < $tmpfile 2>&1'
+ eval echo "$cmd"
+ out=$(eval $cmd)
+ ret=$?
+ rm -f $tmpfile
- if [ $ret != 0 ] ; then
- echo "$out"
- echo "command failed"
- return 1
- fi
+ if [ $ret != 0 ]; then
+ echo "$out"
+ echo "command failed"
+ return 1
+ fi
- echo "$out" | grep $prompt >/dev/null 2>&1
+ echo "$out" | grep $prompt >/dev/null 2>&1
- if [ $? != 0 ] ; then
- echo failed to match interactive prompt on stdout
- return 1
- fi
+ if [ $? != 0 ]; then
+ echo failed to match interactive prompt on stdout
+ return 1
+ fi
- return 0
+ return 0
}
# Test creating a bad symlink and deleting it.
test_bad_symlink()
{
- prompt="posix_unlink deleted file /newname"
- tmpfile=$PREFIX/smbclient_bad_symlinks_commands
+ prompt="posix_unlink deleted file /newname"
+ tmpfile=$PREFIX/smbclient_bad_symlinks_commands
- cat > $tmpfile <<EOF
+ cat >$tmpfile <<EOF
posix
posix_unlink newname
symlink badname newname
@@ -110,349 +110,348 @@ posix_unlink newname
quit
EOF
- cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT "$@" -U$USERNAME%$PASSWORD
//$SERVER/tmp -I $SERVER_IP $ADDARGS < $tmpfile 2>&1'
- eval echo "$cmd"
- out=`eval $cmd`
- ret=$?
- rm -f $tmpfile
+ cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT "$@" -U$USERNAME%$PASSWORD
//$SERVER/tmp -I $SERVER_IP $ADDARGS < $tmpfile 2>&1'
+ eval echo "$cmd"
+ out=$(eval $cmd)
+ ret=$?
+ rm -f $tmpfile
- if [ $ret != 0 ] ; then
- echo "$out"
- echo "failed create then delete bad symlink with error $ret"
- return 1
- fi
+ if [ $ret != 0 ]; then
+ echo "$out"
+ echo "failed create then delete bad symlink with error $ret"
+ return 1
+ fi
- echo "$out" | grep "$prompt" >/dev/null 2>&1
+ echo "$out" | grep "$prompt" >/dev/null 2>&1
- ret=$?
- if [ $ret != 0 ] ; then
- echo "$out"
- echo "failed create then delete bad symlink - grep failed with $ret"
- return 1
- fi
+ ret=$?
+ if [ $ret != 0 ]; then
+ echo "$out"
+ echo "failed create then delete bad symlink - grep failed with
$ret"
+ return 1
+ fi
- return 0
+ return 0
}
# Test creating a good symlink and deleting it by path.
test_good_symlink()
{
- tmpfile=$PREFIX/smbclient.in.$$
- slink_name="$LOCAL_PATH/slink"
- slink_target="$LOCAL_PATH/slink_target"
+ tmpfile=$PREFIX/smbclient.in.$$
+ slink_name="$LOCAL_PATH/slink"
+ slink_target="$LOCAL_PATH/slink_target"
- touch $slink_target
- ln -s $slink_target $slink_name
- cat > $tmpfile <<EOF
+ touch $slink_target
+ ln -s $slink_target $slink_name
+ cat >$tmpfile <<EOF
del slink
quit
EOF
- cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT "$@" -U$USERNAME%$PASSWORD
//$SERVER/tmp -I $SERVER_IP $ADDARGS < $tmpfile 2>&1'
- eval echo "$cmd"
- out=`eval $cmd`
- ret=$?
- rm -f $tmpfile
-
- if [ $ret != 0 ] ; then
- echo "$out"
- echo "failed delete good symlink with error $ret"
- rm $slink_target
- rm $slink_name
- return 1
- fi
+ cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT "$@" -U$USERNAME%$PASSWORD
//$SERVER/tmp -I $SERVER_IP $ADDARGS < $tmpfile 2>&1'
+ eval echo "$cmd"
+ out=$(eval $cmd)
+ ret=$?
+ rm -f $tmpfile
- if [ ! -e $slink_target ] ; then
- echo "failed delete good symlink - symlink target deleted !"
- rm $slink_target
- rm $slink_name
- return 1
- fi
+ if [ $ret != 0 ]; then
+ echo "$out"
+ echo "failed delete good symlink with error $ret"
+ rm $slink_target
+ rm $slink_name
+ return 1
+ fi
+
+ if [ ! -e $slink_target ]; then
+ echo "failed delete good symlink - symlink target deleted !"
+ rm $slink_target
+ rm $slink_name
+ return 1
+ fi
+
+ if [ -e $slink_name ]; then
+ echo "failed delete good symlink - symlink still exists"
+ rm $slink_target
+ rm $slink_name
+ return 1
+ fi
- if [ -e $slink_name ] ; then
- echo "failed delete good symlink - symlink still exists"
rm $slink_target
- rm $slink_name
- return 1
- fi
-
- rm $slink_target
- return 0
+ return 0
}
# Test writing into a read-only directory (logon as guest) fails.
test_read_only_dir()
{
- prompt="NT_STATUS_ACCESS_DENIED making remote directory"
- tmpfile=$PREFIX/smbclient.in.$$
-
-##
-## We can't do this as non-root. We always have rights to
-## create the directory.
-##
- if [ "$USERID" != 0 ] ; then
- echo "skipping test_read_only_dir as non-root"
- return 0
- fi
-
-##
-## We can't do this with an encrypted connection. No credentials
-## to set up the channel.
-##
- if [ "$ADDARGS" = "-e" ] ; then
- echo "skipping test_read_only_dir with encrypted connection"
- return 0
- fi
-
- cat > $tmpfile <<EOF
+ prompt="NT_STATUS_ACCESS_DENIED making remote directory"
+ tmpfile=$PREFIX/smbclient.in.$$
+
+ ##
+ ## We can't do this as non-root. We always have rights to
+ ## create the directory.
+ ##
+ if [ "$USERID" != 0 ]; then
+ echo "skipping test_read_only_dir as non-root"
+ return 0
+ fi
+
+ ##
+ ## We can't do this with an encrypted connection. No credentials
+ ## to set up the channel.
+ ##
+ if [ "$ADDARGS" = "-e" ]; then
+ echo "skipping test_read_only_dir with encrypted connection"
+ return 0
+ fi
+
+ cat >$tmpfile <<EOF
mkdir a_test_dir
quit
EOF
- cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT -U% "//$SERVER/$1" -I $SERVER_IP
$ADDARGS < $tmpfile 2>&1'
- eval echo "$cmd"
- out=`eval $cmd`
- ret=$?
- rm -f $tmpfile
+ cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT -U% "//$SERVER/$1" -I
$SERVER_IP $ADDARGS < $tmpfile 2>&1'
+ eval echo "$cmd"
+ out=$(eval $cmd)
+ ret=$?
+ rm -f $tmpfile
- if [ $ret != 0 ] ; then
- echo "$out"
- echo "failed writing into read-only directory with error $ret"
+ if [ $ret != 0 ]; then
+ echo "$out"
+ echo "failed writing into read-only directory with error $ret"
- return 1
- fi
+ return 1
+ fi
- echo "$out" | grep "$prompt" >/dev/null 2>&1
+ echo "$out" | grep "$prompt" >/dev/null 2>&1
- ret=$?
- if [ $ret != 0 ] ; then
- echo "$out"
- echo "failed writing into read-only directory - grep failed with $ret"
- return 1
- fi
+ ret=$?
+ if [ $ret != 0 ]; then
+ echo "$out"
+ echo "failed writing into read-only directory - grep failed
with $ret"
+ return 1
+ fi
- return 0
+ return 0
}
-
# Test sending a message
test_message()
{
- tmpfile=$PREFIX/message_in.$$
+ tmpfile=$PREFIX/message_in.$$
- cat > $tmpfile <<EOF
+ cat >$tmpfile <<EOF
Test message from pid $$
EOF
- cmd='$SMBCLIENT "$@" -U$USERNAME%$PASSWORD -M $SERVER -p 139 $ADDARGS -n
msgtest < $tmpfile 2>&1'
- eval echo "$cmd"
- out=`eval $cmd`
- ret=$?
+ cmd='$SMBCLIENT "$@" -U$USERNAME%$PASSWORD -M $SERVER -p 139 $ADDARGS
-n msgtest < $tmpfile 2>&1'
+ eval echo "$cmd"
+ out=$(eval $cmd)
+ ret=$?
+
+ if [ $ret != 0 ]; then
+ echo "$out"
+ echo "failed sending message to $SERVER with error $ret"
+ rm -f $tmpfile
+ return 1
+ fi
+
+ # The server writes this into a file message.msgtest, via message.%m to
test the % sub code
+ cmd='$SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/tmpguest -p 139
$ADDARGS -c "get message.msgtest $PREFIX/message_out.$$" 2>&1'
+ eval echo "$cmd"
+ out=$(eval $cmd)
+ ret=$?
+
+ if [ $ret != 0 ]; then
+ echo "$out"
+ echo "failed getting sent message from $SERVER with error $ret"
+ return 1
+ fi
+
+ if [ cmp $PREFIX/message_out.$$ $tmpfile != 0 ]; then
+ echo "failed comparison of message from $SERVER"
+ return 1
+ fi
- if [ $ret != 0 ] ; then
- echo "$out"
- echo "failed sending message to $SERVER with error $ret"
- rm -f $tmpfile
- return 1
- fi
-
- # The server writes this into a file message.msgtest, via message.%m to
test the % sub code
- cmd='$SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/tmpguest -p 139
$ADDARGS -c "get message.msgtest $PREFIX/message_out.$$" 2>&1'
- eval echo "$cmd"
- out=`eval $cmd`
- ret=$?
-
- if [ $ret != 0 ] ; then
- echo "$out"
- echo "failed getting sent message from $SERVER with error $ret"
- return 1
- fi
-
- if [ cmp $PREFIX/message_out.$$ $tmpfile != 0 ] ; then
- echo "failed comparison of message from $SERVER"
- return 1
- fi
-
- return 0
+ return 0
}
# Test reading an owner-only file (logon as guest) fails.
test_owner_only_file()
{
- prompt="NT_STATUS_ACCESS_DENIED opening remote file"
- tmpfile=$PREFIX/smbclient.in.$$
-
-##
-## We can't do this as non-root. We always have rights to
-## read the file.
-##
- if [ "$USERID" != 0 ] ; then
- echo "skipping test_owner_only_file as non-root"
- return 0
- fi
-
-##
-## We can't do this with an encrypted connection. No credentials
-## to set up the channel.
-##
- if [ "$ADDARGS" = "-e" ] ; then
- echo "skipping test_owner_only_file with encrypted connection"
- return 0
- fi
-
- cat > $tmpfile <<EOF
+ prompt="NT_STATUS_ACCESS_DENIED opening remote file"
+ tmpfile=$PREFIX/smbclient.in.$$
+
+ ##
+ ## We can't do this as non-root. We always have rights to
+ ## read the file.
+ ##
+ if [ "$USERID" != 0 ]; then
+ echo "skipping test_owner_only_file as non-root"
+ return 0
+ fi
+
+ ##
+ ## We can't do this with an encrypted connection. No credentials
+ ## to set up the channel.
+ ##
+ if [ "$ADDARGS" = "-e" ]; then
+ echo "skipping test_owner_only_file with encrypted connection"
+ return 0
+ fi
+
+ cat >$tmpfile <<EOF
get unreadable_file
quit
EOF
- cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT "$@" -U% //$SERVER/ro-tmp -I
$SERVER_IP $ADDARGS < $tmpfile 2>&1'
- eval echo "$cmd"
- out=`eval $cmd`
- ret=$?
- rm -f $tmpfile
+ cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT "$@" -U% //$SERVER/ro-tmp -I
$SERVER_IP $ADDARGS < $tmpfile 2>&1'
+ eval echo "$cmd"
+ out=$(eval $cmd)
+ ret=$?
+ rm -f $tmpfile
- if [ $ret != 0 ] ; then
- echo "$out"
- echo "failed reading owner-only file with error $ret"
- return 1
- fi
+ if [ $ret != 0 ]; then
+ echo "$out"
+ echo "failed reading owner-only file with error $ret"
+ return 1
+ fi
- echo "$out" | grep "$prompt" >/dev/null 2>&1
--
Samba Shared Repository
