summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-05-16 12:48:10 +0200
committerGünther Deschner <gd@samba.org>2011-05-16 12:54:33 +0200
commit320789b89024c8dbbb59a628f06622748c329eb4 (patch)
tree1951347593b9b083813c0f978e82eb16bc638c34
parent01bc556d03a592e1f3c848d71b2e72a7cb74706f (diff)
downloadsamba-320789b89024c8dbbb59a628f06622748c329eb4.tar.gz
samba-320789b89024c8dbbb59a628f06622748c329eb4.tar.bz2
samba-320789b89024c8dbbb59a628f06622748c329eb4.zip
s3-selftest: no point in running base.chkpath and base.delaywrite twice.
Thanks to Bjoern Baumbach for pointing this out! Guenther Signed-off-by: Günther Deschner <gd@samba.org>
-rwxr-xr-xsource3/selftest/tests.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 2e5eee1394..08e62ebbec 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -198,17 +198,17 @@ if sub.returncode == 0:
for t in tests:
if t == "base.delaywrite":
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --maximum-runtime=900')
- if t == "rap.sam":
+ elif t == "rap.sam":
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=doscharset=ISO-8859-1')
elif t == "unix.whoami":
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD')
elif t == "raw.samba3posixtimedlock":
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/s3dc/share')
+ elif t == "raw.chkpath":
+ plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD')
else:
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
- if t == "raw.chkpath":
- plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD')
test = 'rpc.lsa.lookupsids'
auth_options = ["", "ntlm", "spnego" ]