s3:tests: Do not delete the contets of LOCAL_PATH with tarmode test

The test_smbclient_tarmode.pl test operates on $LOCAL_PATH by default
and removes everything. So it deletes all precreated files and
directories which the setup_fileserver() function initially set up.

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

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 6854d7c0ecd1c0f8aa6324f227ec1c45e7ed9997..ec8625d84d295b86972bcb2f668b9b402b5e3940 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -767,6 +767,9 @@ sub setup_fileserver($$)
        my $smbget_sharedir="$share_dir/smbget";
        push(@dirs,$smbget_sharedir);
 
+       my $tarmode_sharedir="$share_dir/tarmode";
+       push(@dirs,$tarmode_sharedir);
+
        my $fileserver_options = "
 [lowercase]
        path = $lower_case_share_dir

diff --git a/source3/script/tests/test_smbclient_tarmode.sh b/source3/script/tests/test_smbclient_tarmode.sh
index 331ba2021998eb463ce4b480c727536c33061eb6..3779c38a5caaf6bdf896883240dc8b763cebe00a 100755 (executable)
--- a/source3/script/tests/test_smbclient_tarmode.sh
+++ b/source3/script/tests/test_smbclient_tarmode.sh
@@ -94,10 +94,10 @@ test_tarmode_creation() {
        # Clear temp data
        rm -rf -- "$PREFIX"/tarmode > /dev/null 2>&1
        rm -f "$PREFIX"/tarmode.tar > /dev/null 2>&1
-       rm -rf "$LOCAL_PATH"/tarmode > /dev/null 2>&1
+       rm -rf "$LOCAL_PATH" > /dev/null 2>&1
 
        # Build the test data
-       if ! create_test_data "$LOCAL_PATH/tarmode"; then
+       if ! create_test_data "$LOCAL_PATH"; then
                echo "Test data creation failed"
                false
                return
@@ -119,7 +119,7 @@ test_tarmode_creation() {
        fi
 
        # Verify data
-       if ! validate_data "$PREFIX/tarmode" "$LOCAL_PATH/tarmode"; then
+       if ! validate_data "$PREFIX/tarmode" "$LOCAL_PATH"; then
                echo "Data not equivalent"
                false
                return
@@ -136,7 +136,7 @@ test_tarmode_extraction() {
        # Clear temp data
        rm -rf -- "$PREFIX"/tarmode > /dev/null 2>&1
        rm -f "$PREFIX"/tarmode.tar > /dev/null 2>&1
-       rm -rf "$LOCAL_PATH"/tarmode > /dev/null 2>&1
+       rm -rf "$LOCAL_PATH" > /dev/null 2>&1
 
        # Build the test data
        if ! create_test_data "$PREFIX/tarmode"; then
@@ -161,7 +161,7 @@ test_tarmode_extraction() {
        fi
 
        # Verify data
-       if ! validate_data "$PREFIX/tarmode" "$LOCAL_PATH/tarmode"; then
+       if ! validate_data "$PREFIX/tarmode" "$LOCAL_PATH"; then
                echo "Data not equivalent"
                false
                return

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 9d2a8cce221b14588bc54189e31e9e3f522c3a93..f23428cb7871f783a06f2ff9c73b03d43707ccc5 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -248,13 +248,13 @@ for env in ["fileserver"]:
         plantestsuite("samba3.blackbox.smbclient_tarmode (%s)" % env, env,
                       [os.path.join(samba3srcdir, "script/tests/test_smbclient_tarmode.sh"),
                        '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD',
-                       '$LOCAL_PATH', '$PREFIX', smbclient3, configuration])
+                       '$LOCAL_PATH/tarmode', '$PREFIX', smbclient3, configuration])
 
         # Test suite for new smbclient/tar with libarchive (GSoC 13)
         plantestsuite("samba3.blackbox.smbclient_tar (%s)" % env, env,
                       [os.path.join(samba3srcdir, "script/tests/test_smbclient_tarmode.pl"),
                        '-n', '$SERVER', '-i', '$SERVER_IP', '-s', 'tmp',
-                       '-u', '$USERNAME', '-p', '$PASSWORD', '-l', '$LOCAL_PATH',
+                       '-u', '$USERNAME', '-p', '$PASSWORD', '-l', '$LOCAL_PATH/tarmode',
                        '-d', '$PREFIX', '-b', smbclient3,
                        '--subunit', '--', configuration])