diff options
| author | Michael Adam <obnox@samba.org> | 2012-05-30 12:04:30 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2012-05-31 04:46:06 +0200 |
| commit | df0cadbcc9c3706c8ef86dbc431795b31c1fce70 (patch) | |
| tree | f43e32151900bffb38a23afcca217796760c6e14 | |
| parent | da82c07e13d1d4ecd32c4b040477f12b2388941c (diff) | |
| download | samba-df0cadbcc9c3706c8ef86dbc431795b31c1fce70.tar.gz samba-df0cadbcc9c3706c8ef86dbc431795b31c1fce70.tar.bz2 samba-df0cadbcc9c3706c8ef86dbc431795b31c1fce70.zip | |
s4:selftest: change the blackbox.samba_tool test to use a binary mapping for smbclient
| -rwxr-xr-x | source4/selftest/tests.py | 2 | ||||
| -rwxr-xr-x | source4/utils/tests/test_samba_tool.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index ba50a93399..23d5f203c6 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -303,7 +303,7 @@ planpythontestsuite("dc", "samba.tests.dns") planpythontestsuite("none", "samba.tests.blackbox.ndrdump") planpythontestsuite("none", "samba.tests.source") -plantestsuite("samba4.blackbox.samba_tool(dc:local)", "dc:local", [os.path.join(samba4srcdir, "utils/tests/test_samba_tool.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN']) +plantestsuite("samba4.blackbox.samba_tool(dc:local)", "dc:local", [os.path.join(samba4srcdir, "utils/tests/test_samba_tool.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', smbclient]) plantestsuite("samba4.blackbox.pkinit(dc:local)", "dc:local", [os.path.join(bbdir, "test_pkinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", configuration]) plantestsuite("samba4.blackbox.kinit(dc:local)", "dc:local", [os.path.join(bbdir, "test_kinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", configuration]) plantestsuite("samba4.blackbox.kinit(fl2000dc:local)", "fl2000dc:local", [os.path.join(bbdir, "test_kinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "arcfour-hmac-md5", configuration]) diff --git a/source4/utils/tests/test_samba_tool.sh b/source4/utils/tests/test_samba_tool.sh index 7057312fcb..289a753b66 100755 --- a/source4/utils/tests/test_samba_tool.sh +++ b/source4/utils/tests/test_samba_tool.sh @@ -6,12 +6,12 @@ SERVER_IP=$2 USERNAME=$3 PASSWORD=$4 DOMAIN=$5 -shift 5 +smbclient=$6 +shift 6 failed=0 samba4bindir="$BINDIR" -smbclient="$samba4bindir/smbclient" samba_tool="$samba4bindir/samba-tool" testit() { |