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

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>

diff --git a/source3/script/tests/test_smbclient_tarmode.sh b/source3/script/tests/test_smbclient_tarmode.sh
index 3779c38a5caaf6bdf896883240dc8b763cebe00a..298f428b04169b578fc63b548bd516effef50c9f 100755 (executable)
--- a/source3/script/tests/test_smbclient_tarmode.sh
+++ b/source3/script/tests/test_smbclient_tarmode.sh
@@ -105,7 +105,7 @@ test_tarmode_creation() {
 
        # Create tarfile with smbclient
        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"
                false
                return
@@ -119,7 +119,7 @@ test_tarmode_creation() {
        fi
 
        # Verify data
-       if ! validate_data "$PREFIX/tarmode" "$LOCAL_PATH"; then
+       if ! validate_data "$PREFIX/smbclient_tar" "$LOCAL_PATH"; then
                echo "Data not equivalent"
                false
                return
@@ -146,7 +146,7 @@ test_tarmode_extraction() {
        fi
 
        # 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"
                false
                return
@@ -161,7 +161,7 @@ test_tarmode_extraction() {
        fi
 
        # Verify data
-       if ! validate_data "$PREFIX/tarmode" "$LOCAL_PATH"; then
+       if ! validate_data "$PREFIX/smbclient_tar" "$LOCAL_PATH"; then
                echo "Data not equivalent"
                false
                return

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 349be8cd7da71737dcd858dde09caa6ec2426b67..108e976264392dd7d1e57d4863dca1262250cdfb 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -484,11 +484,11 @@ for env in ["fileserver"]:
     plantestsuite("samba3.blackbox.smbclient_tarmode.NT1", env + "_smb1_done",
                   [os.path.join(samba3srcdir, "script/tests/test_smbclient_tarmode.sh"),
                    '$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,
                   [os.path.join(samba3srcdir, "script/tests/test_smbclient_tarmode.sh"),
                    '$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)
     plantestsuite("samba3.blackbox.smbclient_tar.NT1", env + "_smb1_done",