diff options
| author | Michael Adam <obnox@samba.org> | 2012-05-30 12:21:42 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2012-05-31 04:46:07 +0200 |
| commit | 769908540f047f24fcd3c57a90843abca85252b2 (patch) | |
| tree | 936fbe7bbbd3ae0f9b3f5f2a8b0047f3367a0da9 | |
| parent | 72fbbdb9b35fe2f6da09512fe9d887c7a8211739 (diff) | |
| download | samba-769908540f047f24fcd3c57a90843abca85252b2.tar.gz samba-769908540f047f24fcd3c57a90843abca85252b2.tar.bz2 samba-769908540f047f24fcd3c57a90843abca85252b2.zip | |
s4:selftest: change the blackbox.samba_tool_demote test to use a binary mapping for smbclient
| -rwxr-xr-x | source4/selftest/tests.py | 2 | ||||
| -rwxr-xr-x | source4/utils/tests/test_demote.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index ac68fb0562..9a6af526cc 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -521,7 +521,7 @@ plantestsuite("samba4.blackbox.provision-backend", "none", ["PYTHON=%s" % python plantestsuite("samba4.blackbox.renamedc.sh", "none", ["PYTHON=%s" % python, os.path.join(bbdir, "renamedc.sh"), '$PREFIX/provision']) # Demote the vampire DC, it must be the last test on the VAMPIRE DC -plantestsuite("samba4.blackbox.samba_tool_demote(vampire_dc)", "vampire_dc", [os.path.join(samba4srcdir, "utils/tests/test_demote.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', '$DC_SERVER', '$PREFIX/vampire_dc']) +plantestsuite("samba4.blackbox.samba_tool_demote(vampire_dc)", "vampire_dc", [os.path.join(samba4srcdir, "utils/tests/test_demote.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', '$DC_SERVER', '$PREFIX/vampire_dc', smbclient]) # check the databases are all OK. PLEASE LEAVE THIS AS THE LAST TEST for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]: plantestsuite("samba4.blackbox.dbcheck(%s)" % env, env + ":local" , ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck.sh"), '$PREFIX/provision', configuration]) diff --git a/source4/utils/tests/test_demote.sh b/source4/utils/tests/test_demote.sh index 3d255ed91f..0c2c03c98b 100755 --- a/source4/utils/tests/test_demote.sh +++ b/source4/utils/tests/test_demote.sh @@ -8,12 +8,12 @@ PASSWORD=$4 DOMAIN=$5 DC=$6 PROV=$7 -shift 7 +smbclient=$8 +shift 8 failed=0 samba4bindir="$BINDIR" -smbclient="$samba4bindir/smbclient" samba_tool="$samba4bindir/samba-tool" testit() { |