Attachment 13785 Details for Bug 13140 – git-am fix for 4.6.next.

[patch] git-am fix for 4.6.next.

bug-13140-4.6 (text/plain), 2.15 KB, created by Jeremy Allison on 2017-11-15 19:55:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2017-11-15 19:55:18 UTC

Size: 2.15 KB

patch

obsolete

>From b7001a4ad364611f2da8078c3b731772c2ba4108 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Tue, 14 Nov 2017 15:54:19 -0800
>Subject: [PATCH] s3: smbclient: tests: Test "volume" command over SMB1 and
> SMB2+.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13140
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>
>Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
>Autobuild-Date(master): Wed Nov 15 19:50:54 CET 2017 on sn-devel-144
>
>(cherry picked from commit f8cd211acc3824e01d89a6f8b6666c39aa5cd54e)
>---
> source3/script/tests/test_smbclient_s3.sh | 32 +++++++++++++++++++++++++++++++
> 1 file changed, 32 insertions(+)
>
>diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
>index ce1cb089ea9..fae8b1f245b 100755
>--- a/source3/script/tests/test_smbclient_s3.sh
>+++ b/source3/script/tests/test_smbclient_s3.sh
>@@ -1277,6 +1277,34 @@ done
> 
> LOGDIR=$(mktemp -d ${PREFIX}/${LOGDIR_PREFIX}_XXXXXX)
> 
>+# Test doing a volume command.
>+test_volume()
>+{
>+    tmpfile=$PREFIX/smbclient_interactive_prompt_commands
>+    cat > $tmpfile <<EOF
>+volume
>+quit
>+EOF
>+    cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp -I $SERVER_IP $ADDARGS < $tmpfile 2>&1'
>+    eval echo "$cmd"
>+    out=`eval $cmd`
>+    ret=$?
>+    rm -f $tmpfile
>+
>+    if [ $ret != 0 ] ; then
>+	echo "$out"
>+	echo "failed doing volume command with error $ret"
>+	return 1
>+    fi
>+
>+    echo "$out" | grep '^Volume: |tmp| serial number'
>+    ret=$?
>+    if [ $ret != 0 ] ; then
>+	echo "$out"
>+	echo "failed doing volume command"
>+	return 1
>+    fi
>+}
> 
> testit "smbclient -L $SERVER_IP" $SMBCLIENT -L $SERVER_IP -N -p 139 || failed=`expr $failed + 1`
> testit "smbclient -L $SERVER -I $SERVER_IP" $SMBCLIENT -L $SERVER -I $SERVER_IP -N -p 139 -c quit || failed=`expr $failed + 1`
>@@ -1373,6 +1401,10 @@ testit "follow local symlinks" \
>     test_local_symlinks || \
>     failed=`expr $failed + 1`
> 
>+testit "volume" \
>+    test_volume || \
>+    failed=`expr $failed + 1`
>+
> testit "rm -rf $LOGDIR" \
>     rm -rf $LOGDIR || \
>     failed=`expr $failed + 1`
>-- 
>2.15.0.448.gf294e3d99a-goog
>

Flags:

asn: review-

Actions: View

Attachments on bug 13140: 13782 | 13783 | 13785 | 13788