Attachment 7758 Details for Bug 9088 – 0002-Add-smbclient-tarmode-test.patch

[patch] 0002-Add-smbclient-tarmode-test.patch

0002-Add-smbclient-tarmode-test.patch (text/plain), 3.25 KB, created by Sal Gonzalez on 2012-08-12 18:06:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sal Gonzalez

Created: 2012-08-12 18:06:51 UTC

Size: 3.25 KB

patch

obsolete

>From 90834834a4bf1546cd06d2948e0282108ec4f457 Mon Sep 17 00:00:00 2001
>From: "Salvador I. Gonzalez" <sgonzalez@codejunkie.net>
>Date: Sat, 11 Aug 2012 10:48:36 -0400
>Subject: [PATCH 2/4] Add smbclient tarmode test
>
>---
> source3/script/tests/test_smbclient_tarmode.sh |   57 ++++++++++++++++++++++++
> source3/selftest/tests.py                      |    4 ++
> 2 files changed, 61 insertions(+), 0 deletions(-)
> create mode 100755 source3/script/tests/test_smbclient_tarmode.sh
>
>diff --git a/source3/script/tests/test_smbclient_tarmode.sh b/source3/script/tests/test_smbclient_tarmode.sh
>new file mode 100755
>index 0000000..81412b5
>--- /dev/null
>+++ b/source3/script/tests/test_smbclient_tarmode.sh
>@@ -0,0 +1,57 @@
>+#!/bin/sh
>+
>+# this runs a simple tarmode test
>+
>+if [ $# -lt 4 ]; then
>+cat <<EOF
>+Usage: test_smbclient_tarmode.sh SERVER SERVER_IP USERNAME PASSWORD SMBCLIENT <smbclient arguments>
>+EOF
>+exit 1;
>+fi
>+
>+SERVER="$1"
>+SERVER_IP="$2"
>+USERNAME="$3"
>+PASSWORD="$4"
>+SMBCLIENT="$5"
>+SMBCLIENT="$VALGRIND ${SMBCLIENT}"
>+shift 5
>+ADDARGS="$*"
>+
>+incdir=`dirname $0`/../../../testprogs/blackbox
>+. $incdir/subunit.sh
>+
>+# Build a quick Dir structure
>+TEMPDIR="/tmp"
>+TESTDIR="tarmode.test.$$"
>+mkdir -p "/tmp/$TESTDIR"
>+
>+NUM_TEST_FILES=10
>+if od --version > /dev/null 2>&1; then # Use random file sizes
>+	I=1
>+	for RND in `od -An -N$NUM_TEST_FILES -tu1 < /dev/urandom`; do
>+		dd if=/dev/urandom of="$TEMPDIR/$TESTDIR/test.dat.$I" bs=1024 count=$RND
>+		I=`expr $I + 1`
>+	done
>+else # Fallback to same file sizes
>+	I=1
>+	while [ $I -le $NUM_TEST_FILES ]; do
>+		dd if=/dev/urandom of="$TEMPDIR/$TESTDIR/test.dat.$I" bs=1024 count=25
>+		I=`expr $I + 1`
>+	done
>+fi
>+
>+# Upload to server
>+( cd $TMPDIR && \
>+	$SMBCLIENT //$SERVER/c$ $CONFIGURATION -U$USERNAME%$PASSWORD -I $SERVER_IP -p 139 \
>+		-c "recurse;prompt;mput $TESTDIR" )
>+
>+testit "smbclient //$SERVER/c$ tarmode" $SMBCLIENT //$SERVER/c$ $CONFIGURATION -U$USERNAME%$PASSWORD -I $SERVER_IP -p 139 \
>+	-c "tarmode full" -Tc /dev/null "/$TESTDIR" $ADDARGS
>+
>+# Cleanup our mess.  FIXME: Will this run if the test fails?
>+rm -rf -- "$TMPDIR/$TESTDIR"
>+$SMBCLIENT //$SERVER/c$ $CONFIGURATION -U$USERNAME%$PASSWORD -I $SERVER_IP -p 139 \
>+	-D "$TESTDIR" -c "del *"
>+$SMBCLIENT //$SERVER/c$ $CONFIGURATION -U$USERNAME%$PASSWORD -I $SERVER_IP -p 139 \
>+	-c "rd $TESTDIR"
>diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
>index a890372..f28293d 100755
>--- a/source3/selftest/tests.py
>+++ b/source3/selftest/tests.py
>@@ -207,6 +207,10 @@ for env in ["member", "s3member"]:
> for env in ["s3dc"]:
>     plantestsuite("samba3.blackbox.smbclient_s3.crypt (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', smbclient, wbinfo, configuration, "-e"])
> 
>+# Test smbclient/tarmode
>+for env in [""]:
>+    plantestsuite("samba3.blackbox.smbclient_tarmode (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_tarmode.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', smbclient, configuration])
>+
> #TODO encrypted against member, with member creds, and with DC creds
> plantestsuite("samba3.blackbox.net.misc", "s3dc:local",
>               [os.path.join(samba3srcdir, "script/tests/test_net_misc.sh"),
>-- 
>1.7.8.6
>

Actions: View

Attachments on bug 9088: 7756 | 7757 | 7758 | 7759 | 7760 | 7761 | 7762 | 7763