mirror of
https://github.com/samba-team/samba.git
synced 2025-08-03 04:22:09 +03:00
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>
This commit is contained in:
committed by
Jeremy Allison
parent
a250f73366
commit
6cb0a00f4a
@ -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
|
||||
|
Reference in New Issue
Block a user