summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-03-05 14:52:36 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-03-05 08:15:05 +0100
commit6dbf632bc3e035ffd68fe67e06657593870dc2ac (patch)
treeece728256efd8aa56726cdf840824663dbab7ce3
parentfc5762388a725cd18d10a356960382ea050c8064 (diff)
downloadsamba-6dbf632bc3e035ffd68fe67e06657593870dc2ac.tar.gz
samba-6dbf632bc3e035ffd68fe67e06657593870dc2ac.tar.bz2
samba-6dbf632bc3e035ffd68fe67e06657593870dc2ac.zip
selftest: Reduce declarations of smbclient_auth tests by moving into a loop
-rwxr-xr-xsource3/selftest/tests.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index c3f5594209..74c745fa01 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -121,6 +121,7 @@ tests=["--ping", "--separator",
for env in ["s3dc", "member", "s3member"]:
plantestsuite("samba3.blackbox.smbclient_auth.plain (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', binpath('smbclient3'), configuration])
+ plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$SERVER\\\\$USERNAME', '$PASSWORD', binpath('smbclient3'), configuration])
for t in tests:
plantestsuite("samba3.wbinfo_s3.(%s:local).%s" % (env, t), "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_wbinfo_s3.sh"), t])
@@ -143,9 +144,6 @@ plantestsuite("samba3.ntlm_auth.krb5(ktest:local)", "ktest:local", [os.path.join
for env in ["secserver"]:
plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) domain creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN\\\\$DC_USERNAME', '$DC_PASSWORD', binpath('smbclient3'), configuration + " --option=clientntlmv2auth=no"])
-for env in ["member", "s3member"]:
- plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$SERVER\\\\$USERNAME', '$PASSWORD', binpath('smbclient3'), configuration])
-
for env in ["maptoguest", "secshare", "secserver"]:
plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) local creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', binpath('smbclient3'), configuration + " --option=clientntlmv2auth=no --option=clientlanmanauth=yes"])