diff options
| author | Michael Adam <obnox@samba.org> | 2012-05-29 13:47:32 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2012-05-31 04:46:06 +0200 |
| commit | 953163ddc7f1cb6dcfcb2172382c4d372465744c (patch) | |
| tree | 7d2552f5697205182ea6086734530295ab95a317 | |
| parent | 5ec763aeec3743aeee8e6fdfe6a518bd12d05641 (diff) | |
| download | samba-953163ddc7f1cb6dcfcb2172382c4d372465744c.tar.gz samba-953163ddc7f1cb6dcfcb2172382c4d372465744c.tar.bz2 samba-953163ddc7f1cb6dcfcb2172382c4d372465744c.zip | |
s3:selftest: introduce a variable for binpath('ntlm_auth3') in tests.py
| -rwxr-xr-x | source3/selftest/tests.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 77596c6d0d..a33defcd29 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -31,6 +31,7 @@ smbclient = binpath('smbclient3') wbinfo = binpath('wbinfo') net = binpath('net') smbtorture3 = binpath('smbtorture3') +ntlm_auth = binpath('ntlm_auth3') torture_options = [configuration, "--maximum-runtime=$SELFTEST_MAXTIME", "--basedir=$SELFTEST_TMPDIR", @@ -162,17 +163,17 @@ for env in ["s3dc", "member", "s3member"]: 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]) + [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_diagnostics.sh"), ntlm_auth, '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', configuration]) - plantestsuite("samba3.ntlm_auth.(%s:local)" % env, "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_s3.sh"), valgrindify(python), samba3srcdir, binpath('ntlm_auth3'), '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', configuration]) + plantestsuite("samba3.ntlm_auth.(%s:local)" % env, "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_s3.sh"), valgrindify(python), samba3srcdir, ntlm_auth, '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', configuration]) env = "s3member" t = "--krb5auth=$DOMAIN\\\\$DC_USERNAME%$DC_PASSWORD" plantestsuite("samba3.wbinfo_s3.(%s:local).%s" % (env, t), "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_wbinfo_s3.sh"), t]) -plantestsuite("samba3.ntlm_auth.krb5(ktest:local) old ccache", "ktest:local", [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_krb5.sh"), valgrindify(python), samba3srcdir, binpath('ntlm_auth3'), '$PREFIX/ktest/krb5_ccache-2', '$SERVER', configuration]) +plantestsuite("samba3.ntlm_auth.krb5(ktest:local) old ccache", "ktest:local", [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_krb5.sh"), valgrindify(python), samba3srcdir, ntlm_auth, '$PREFIX/ktest/krb5_ccache-2', '$SERVER', configuration]) -plantestsuite("samba3.ntlm_auth.krb5(ktest:local)", "ktest:local", [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_krb5.sh"), valgrindify(python), samba3srcdir, binpath('ntlm_auth3'), '$PREFIX/ktest/krb5_ccache-3', '$SERVER', configuration]) +plantestsuite("samba3.ntlm_auth.krb5(ktest:local)", "ktest:local", [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_krb5.sh"), valgrindify(python), samba3srcdir, ntlm_auth, '$PREFIX/ktest/krb5_ccache-3', '$SERVER', configuration]) for env in ["maptoguest", "secshare"]: |