[PATCHES] tests and smbtorture3

[Michael Adam]

Hi,

attached find three small patches.

The first one lets the LOCAL-* smbtorture3 tests
run not against the s3dc environment but against
the "none" env. These tests don't need any server running.

The second and third patche improve the help message
of smbtorture3.

Review/push/comment appreciated.

Thanks - Michael
-------------- next part --------------
From a9fe1f69587de827283dd0c92812d1943bfb161c Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 22 Sep 2014 01:24:49 +0200
Subject: [PATCH 1/3] selftst: run the smbtorture3 local tests in the "none"
 environment

Signed-off-by: Michael Adam <obnox at samba.org>
---
 source3/selftest/tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 126c26c..f3ecdff 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -114,7 +114,7 @@ local_tests = [
     "LOCAL-remove_duplicate_addrs2"]
 
 for t in local_tests:
-    plantestsuite("samba3.smbtorture_s3.%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "-e"])
+    plantestsuite("samba3.smbtorture_s3.%s" % t, "none", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//foo/bar', '""', '""', smbtorture3, ""])
 
 plantestsuite("samba.vfstest.stream_depot", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/stream-depot/run.sh"), binpath("vfstest"), "$PREFIX", configuration])
 plantestsuite("samba.vfstest.xattr-tdb-1", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/xattr-tdb-1/run.sh"), binpath("vfstest"), "$PREFIX", configuration])
-- 
1.9.1


From b9d678d9c67935a05136f6da178deb1a1f3ec87d Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 22 Sep 2014 01:27:33 +0200
Subject: [PATCH 2/3] s3:smbtorture: mention "-e" in the help text

Signed-off-by: Michael Adam <obnox at samba.org>
---
 source3/torture/torture.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 987b23c..04f90be 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -9715,6 +9715,7 @@ static void usage(void)
 	printf("\t-s seed\n");
 	printf("\t-b unclist_filename   specify multiple shares for multiple connections\n");
 	printf("\t-f filename   filename to test\n");
+	printf("\t-e                    encrypt\n");
 	printf("\n\n");
 
 	printf("tests are:");
-- 
1.9.1


From 1ecabb2d1774227da87dd90cefa226f6e012eea5 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 22 Sep 2014 01:28:19 +0200
Subject: [PATCH 3/3] s3:smbtorture: align explanations for parameters

Signed-off-by: Michael Adam <obnox at samba.org>
---
 source3/torture/torture.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 04f90be..799afc7 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -9701,7 +9701,7 @@ static void usage(void)
 
 	printf("\t-d debuglevel\n");
 	printf("\t-U user%%pass\n");
-	printf("\t-k               use kerberos\n");
+	printf("\t-k                    use kerberos\n");
 	printf("\t-N numprocs\n");
 	printf("\t-n my_netbios_name\n");
 	printf("\t-W workgroup\n");
@@ -9709,12 +9709,12 @@ static void usage(void)
 	printf("\t-O socket_options\n");
 	printf("\t-m maximum protocol\n");
 	printf("\t-L use oplocks\n");
-	printf("\t-c CLIENT.TXT   specify client load file for NBENCH\n");
+	printf("\t-c CLIENT.TXT         specify client load file for NBENCH\n");
 	printf("\t-A showall\n");
 	printf("\t-p port\n");
 	printf("\t-s seed\n");
 	printf("\t-b unclist_filename   specify multiple shares for multiple connections\n");
-	printf("\t-f filename   filename to test\n");
+	printf("\t-f filename           filename to test\n");
 	printf("\t-e                    encrypt\n");
 	printf("\n\n");
 
-- 
1.9.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140922/66b88659/attachment.pgp>