sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

s3/script/test: Use different testdir for samba3.blackbox.smbclient_tarmode

Browse Source 
The other tarmode torture test samba3.blackbox.smbclient_tar now uses a share
'tarmode' which uses the same source path as samba3.blackbox.smbclient_tarmode

Avoid conflicting paths and use a new subdir (of the test share) called
'smbclient_tarmode'

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14581

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Noel Power
2020-11-27 15:25:21 +00:00
committed by Jeremy Allison
parent a250f73366
commit 6cb0a00f4a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source3/script/tests/test_smbclient_tarmode.sh
View File

@ -105,7 +105,7 @@ test_tarmode_creation() {
# Create tarfile with smbclient # Create tarfile with smbclient
if ! $SMBCLIENT //$SERVER/tmp $CONFIGURATION -U$USERNAME%$PASSWORD -I $SERVER_IP -p 139 \ if ! $SMBCLIENT //$SERVER/tmp $CONFIGURATION -U$USERNAME%$PASSWORD -I $SERVER_IP -p 139 \
$ADDARGS -c "tarmode full" -Tc "$PREFIX/tarmode.tar" "/tarmode"; then $ADDARGS -c "tarmode full" -Tc "$PREFIX/tarmode.tar" "/smbclient_tar"; then
echo "Couldn't create tar file with tarmode -Tc" echo "Couldn't create tar file with tarmode -Tc"
false false
return return
@ -119,7 +119,7 @@ test_tarmode_creation() {
fi fi
# Verify data # Verify data
if ! validate_data "$PREFIX/tarmode" "$LOCAL_PATH"; then if ! validate_data "$PREFIX/smbclient_tar" "$LOCAL_PATH"; then
echo "Data not equivalent" echo "Data not equivalent"
false false
return return
@ -146,7 +146,7 @@ test_tarmode_extraction() {
fi fi
# Create tarfile to extract on client # Create tarfile to extract on client
if ! tar -cf "$PREFIX/tarmode.tar" -C "$PREFIX" tarmode; then if ! tar -cf "$PREFIX/tarmode.tar" -C "$PREFIX" smbclient_tar; then
echo "Couldn't create tar archive" echo "Couldn't create tar archive"
false false
return return
@ -161,7 +161,7 @@ test_tarmode_extraction() {
fi fi
# Verify data # Verify data
if ! validate_data "$PREFIX/tarmode" "$LOCAL_PATH"; then if ! validate_data "$PREFIX/smbclient_tar" "$LOCAL_PATH"; then
echo "Data not equivalent" echo "Data not equivalent"
false false
return return

4
source3/selftest/tests.py
View File

@ -484,11 +484,11 @@ for env in ["fileserver"]:
plantestsuite("samba3.blackbox.smbclient_tarmode.NT1", env + "_smb1_done", plantestsuite("samba3.blackbox.smbclient_tarmode.NT1", env + "_smb1_done",
[os.path.join(samba3srcdir, "script/tests/test_smbclient_tarmode.sh"), [os.path.join(samba3srcdir, "script/tests/test_smbclient_tarmode.sh"),
'$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD',
'$LOCAL_PATH/tarmode', '$PREFIX', smbclient3, configuration, "-mNT1"]) '$LOCAL_PATH/smbclient_tar', '$PREFIX', smbclient3, configuration, "-mNT1"])
plantestsuite("samba3.blackbox.smbclient_tarmode.SMB3", env, plantestsuite("samba3.blackbox.smbclient_tarmode.SMB3", env,
[os.path.join(samba3srcdir, "script/tests/test_smbclient_tarmode.sh"), [os.path.join(samba3srcdir, "script/tests/test_smbclient_tarmode.sh"),
'$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD',
'$LOCAL_PATH/tarmode', '$PREFIX', smbclient3, configuration, "-mSMB3"]) '$LOCAL_PATH/smbclient_tar', '$PREFIX', smbclient3, configuration, "-mSMB3"])
# Test suite for new smbclient/tar with libarchive (GSoC 13) # Test suite for new smbclient/tar with libarchive (GSoC 13)
plantestsuite("samba3.blackbox.smbclient_tar.NT1", env + "_smb1_done", plantestsuite("samba3.blackbox.smbclient_tar.NT1", env + "_smb1_done",