s3:selftest: run smb2.session as ntlm and krb5

This activates the smb2.session.expire1 test, when krb5 is used.

metze

diff --git a/selftest/knownfail b/selftest/knownfail
index 19fe9218ba9178a9b10b0e5fb99928ae88a0ee13..97096e107ffcea40d6476e8604bdd8058ae6c86a 100644 (file)
--- 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 4aedbf852a510da671ad45fc4eaefc598a9bc072..083fb1fb4d37f1f8fdd402ea29e184fb727035d8 100755 (executable)
--- 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')