diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-02-13 12:16:07 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-02-20 13:50:52 +1100 |
| commit | 8c3bbc09795937f359cbfee027821a4648b7d941 (patch) | |
| tree | febe392680bab6d342474609a74c13c653cb7c57 /source3/selftest | |
| parent | 3cd7fdab62e2a99a1068f9e8f5a09e0345b4cc90 (diff) | |
| download | samba-8c3bbc09795937f359cbfee027821a4648b7d941.tar.gz samba-8c3bbc09795937f359cbfee027821a4648b7d941.tar.bz2 samba-8c3bbc09795937f359cbfee027821a4648b7d941.zip | |
selftest: test member server tests in security=ads
By testing more things against s3member (which is security=ads against samba4)
we can improve our test coverage.
Andrew Bartlett
Diffstat (limited to 'source3/selftest')
| -rwxr-xr-x | source3/selftest/tests.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index c52f61641c..3f8dcc1f56 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -123,26 +123,26 @@ tests=["--ping", "--separator", "--allocate-uid", "--allocate-gid"] -for t in tests: - plantestsuite("samba3.wbinfo_s3.(s3dc:local).%s" % t, "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_wbinfo_s3.sh"), t]) - plantestsuite("samba3.wbinfo_s3.(member:local).%s" % t, "member:local", [os.path.join(samba3srcdir, "script/tests/test_wbinfo_s3.sh"), t]) - -plantestsuite( - "samba3.wbinfo_sids2xids.(member:local)", "member:local", - [os.path.join(samba3srcdir, "script/tests/test_wbinfo_sids2xids.sh")]) +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.ntlm_auth.(s3dc:local)", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_s3.sh"), valgrindify(python), samba3srcdir, binpath('ntlm_auth3'), 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]) -for env in ["s3dc", "member"]: - 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.wbinfo_sids2xids.(%s:local)" % env, "%s:local" % env, + [os.path.join(samba3srcdir, "script/tests/test_wbinfo_sids2xids.sh")]) + plantestsuite( "samba3.ntlm_auth.diagnostics(%s:local)" % env, "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_diagnostics.sh"), binpath('ntlm_auth3'), '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', configuration]) +plantestsuite("samba3.ntlm_auth.(s3dc:local)", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_s3.sh"), valgrindify(python), samba3srcdir, binpath('ntlm_auth3'), configuration]) + 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"]: +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"]: @@ -155,13 +155,13 @@ plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) bad username" % env, en for env in ["s3dc"]: plantestsuite("samba3.blackbox.smbclient_s3.plain (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), binpath('wbinfo'), configuration]) -for env in ["member"]: +for env in ["member", "s3member"]: plantestsuite("samba3.blackbox.smbclient_s3.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER', '$SERVER\\\\$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), binpath('wbinfo'), configuration]) for env in ["s3dc"]: plantestsuite("samba3.blackbox.smbclient_s3.sign (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), binpath('wbinfo'), configuration, "--signing=required"]) -for env in ["member"]: +for env in ["member", "s3member"]: plantestsuite("samba3.blackbox.smbclient_s3.sign (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER', '$SERVER\\\\$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), binpath('wbinfo'), configuration, "--signing=required"]) # encrypted |