summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-06-22 13:03:16 +0200
committerStefan Metzmacher <metze@samba.org>2012-06-25 20:55:06 +0200
commitce2203762132391e8df117b89c9ad45b57c2143d (patch)
tree563c1c33a5d78648dd54bf433cb4dc8465ff398a
parent500e646e2d5ed7a10211ab2309f1f800560918e9 (diff)
downloadsamba-ce2203762132391e8df117b89c9ad45b57c2143d.tar.gz
samba-ce2203762132391e8df117b89c9ad45b57c2143d.tar.bz2
samba-ce2203762132391e8df117b89c9ad45b57c2143d.zip
s3:selftest: run smb2.session as ntlm and krb5
This activates the smb2.session.expire1 test, when krb5 is used. metze
-rw-r--r--selftest/knownfail4
-rwxr-xr-xsource3/selftest/tests.py4
2 files changed, 6 insertions, 2 deletions
diff --git a/selftest/knownfail b/selftest/knownfail
index 19fe9218ba..97096e107f 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -191,8 +191,8 @@
^samba3.smb2.streams.attributes
^samba3.smb2.getinfo.getinfo
^samba3.smb2.setinfo.setinfo
-^samba3.smb2.session.reconnect
-^samba3.smb2.session.reauth5 # some special anonymous checks?
+^samba3.smb2.session.*reconnect
+^samba3.smb2.session.*reauth5 # some special anonymous checks?
^samba3.rpc.spoolss.printer.addprinter.driver_info_winreg # knownfail or flapping?
^samba3.rpc.spoolss.printer.addprinterex.driver_info_winreg # knownfail or flapping?
#
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 4aedbf852a..083fb1fb4d 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -318,6 +318,10 @@ for t in tests:
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
plansmbtorturetestsuite(t, "secshare", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
+ elif t == "smb2.session":
+ plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
+ plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER/tmp -k no -U$USERNAME%$PASSWORD', 'ntlm')
+ plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER/tmp -k yes -U$USERNAME%$PASSWORD', 'krb5')
else:
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')