sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

tests: add a test for vfs_recycle

Browse Source 
Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Björn Jacke 2024-01-06 17:32:57 +01:00 committed by Volker Lendecke
parent 2df2e34c3c
commit f02b0b984b
3 changed files with 114 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
selftest/target/Samba3.pm
View File

@ -2687,6 +2687,9 @@ sub provision($$)
my $smbget_sharedir="$shrdir/smbget";
push(@dirs, $smbget_sharedir);
my $recycle_shrdir="$shrdir/recycle";
push(@dirs,$recycle_shrdir);
# this gets autocreated by winbindd
my $wbsockdir="$prefix_abs/wbsock";
@ -3596,6 +3599,14 @@ sub provision($$)
path = $smbget_sharedir
comment = smb username is [%U]
[recycle]
copy = tmp
path = $recycle_shrdir
vfs objects = recycle
recycle : repository = .trash
recycle : exclude = *.tmp
recycle : directory_mode = 755
[smbget_guest]
path = $smbget_sharedir
comment = smb username is [%U]

102
source3/script/tests/test_recycle.sh Executable file
View File

@ -0,0 +1,102 @@
#!/bin/sh
if [ $# -lt 7 ]; then
cat <<EOF
Usage: test_recycle.sh SERVER SERVER_IP USERNAME PASSWORD LOCAL_PATH PREFIX SMBCLIENT ADDARGS
EOF
exit 1
fi
SERVER="${1}"
SERVER_IP="${2}"
USERNAME="${3}"
PASSWORD="${4}"
LOCAL_PATH="${5}"
PREFIX="${6}"
SMBCLIENT="${7}"
SMBCLIENT="$VALGRIND ${SMBCLIENT}"
shift 7
ADDARGS="$*"
incdir=$(dirname "$0")/../../../testprogs/blackbox
. "$incdir"/subunit.sh
failed=0
# Do not let deprecated option warnings muck this up
SAMBA_DEPRECATED_SUPPRESS=1
export SAMBA_DEPRECATED_SUPPRESS
# Define the test environment/filenames.
#
share_test_dir="$LOCAL_PATH"
#
# Cleanup function.
#
do_cleanup()
{
(
#subshell.
cd "$share_test_dir" || return
rm -f testfile1
rm -f testfile2.tmp
rm -rf .trash
)
}
#
# Ensure we start from a clean slate.
#
do_cleanup
test_recycle()
{
tmpfile=$PREFIX/smbclient_interactive_prompt_commands
echo "
put $tmpfile testfile1
put $tmpfile testfile2.tmp
del testfile1
del testfile2.tmp
quit
" > $tmpfile
cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT -U$USERNAME%$PASSWORD //$SERVER/recycle -I$SERVER_IP $ADDARGS < $tmpfile 2>&1'
eval echo "$cmd"
out=$(eval "$cmd")
ret=$?
rm -f "$tmpfile"
if [ $ret != 0 ]; then
printf "%s\n" "$out"
printf "failed recycle smbclient run with error %s\n" "$ret"
return 1
fi
test -e "$share_test_dir/.trash/testfile1" || {
printf ".trash/testfile1 expected to exist but does NOT exist\n"
return 1
}
test -e "$share_test_dir/.trash/testfile2.tmp" && {
printf ".trash/testfile2.tmp not expected to exist but DOES exist\n"
return 1
}
perm_want=755
perm_is=`stat -c '%a' "$share_test_dir/.trash/"`
test "$perm_is" = "$perm_want" || {
printf ".trash/ permission should be $perm_want but is $perm_is\n"
return 1
}
return 0
}
testit "recycle" \
test_recycle ||
failed=$((failed + 1))
#
# Cleanup.
do_cleanup
testok "$0" "$failed"

1
source3/selftest/tests.py
View File

@ -763,6 +763,7 @@ for env in ["fileserver"]:
plantestsuite("samba3.blackbox.force_create_mode", env, [os.path.join(samba3srcdir, "script/tests/test_force_create_mode.sh"), '$SERVER', '$DOMAIN', '$USERNAME', '$PASSWORD', '$PREFIX', env, smbclient3])
plantestsuite("samba3.blackbox.dropbox", env, [os.path.join(samba3srcdir, "script/tests/test_dropbox.sh"), '$SERVER', '$DOMAIN', 'gooduser', '$PASSWORD', '$PREFIX', env, smbclient3])
plantestsuite("samba3.blackbox.offline", env, [os.path.join(samba3srcdir, "script/tests/test_offline.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/offline', smbclient3])
plantestsuite("samba3.blackbox.recycle", env, [os.path.join(samba3srcdir, "script/tests/test_recycle.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/recycle', '$PREFIX', smbclient3])
plantestsuite("samba3.blackbox.shadow_copy2.NT1", env + "_smb1_done", [os.path.join(samba3srcdir, "script/tests/test_shadow_copy.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/shadow', smbclient3, '-m', 'NT1'])
plantestsuite("samba3.blackbox.shadow_copy2.SMB3", env, [os.path.join(samba3srcdir, "script/tests/test_shadow_copy.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/shadow', smbclient3, '-m', 'SMB3'])
plantestsuite("samba3.blackbox.shadow_copy_torture", env, [os.path.join(samba3srcdir, "script/tests/test_shadow_copy_torture.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/shadow', smbtorture4, smbclient3])