summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-07-26 16:17:30 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-08-03 18:48:04 +1000
commit41ee4e8bcc8edb0048f5e11b741f17c7733a469f (patch)
tree74715e47d70ef10bd945736588f6cea48f272843
parentd3524f2eaeef06059fcdc7af5b742cd46064fd20 (diff)
downloadsamba-41ee4e8bcc8edb0048f5e11b741f17c7733a469f.tar.gz
samba-41ee4e8bcc8edb0048f5e11b741f17c7733a469f.tar.bz2
samba-41ee4e8bcc8edb0048f5e11b741f17c7733a469f.zip
selftest: Add kerberos tests to plugin_s4_dc tests
Signed-off-by: Andrew Tridgell <tridge@samba.org>
-rwxr-xr-xsource4/selftest/tests.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 01015f3293..538ec5d451 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -339,6 +339,9 @@ for mech in [
plantestsuite_loadlist("samba4.%s domain-creds" % name, "s4member", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy'])
if have_ads_support:
plantestsuite_loadlist("samba4.%s domain-creds" % name, "s3member", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy'])
+ plantestsuite_loadlist("samba4.%s" % name, "plugin_s4_dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$USERNAME%$PASSWORD', 'base.xcopy'])
+ plantestsuite_loadlist("samba4.%s administrator" % name, "plugin_s4_dc",
+ [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy'])
for mech in [
"-k no",
@@ -347,9 +350,7 @@ for mech in [
signoptions = "%s --signing=off" % mech
name = "smb.signing on with %s" % signoptions
plantestsuite_loadlist("samba4.%s local-creds" % name, "s4member", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'base.xcopy'])
- if have_ads_support:
- plantestsuite_loadlist("samba4.%s" % name, "plugin_s4_dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$USERNAME%$PASSWORD', 'base.xcopy'])
- plantestsuite_loadlist("samba4.%s administrator" % name, "plugin_s4_dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy'])
+
plantestsuite_loadlist("samba4.smb.signing --signing=yes anon", "dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=yes', '-U%', 'base.xcopy'])
plantestsuite_loadlist("samba4.smb.signing --signing=required anon", "dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=required', '-U%', 'base.xcopy'])
plantestsuite_loadlist("samba4.smb.signing --signing=no anon", "s4member", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=no', '-U%', 'base.xcopy'])