s4:selftest: change the blackbox.samba_tool_demote test to use a binary mapping for...

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index ac68fb05623c40fd4d8363a231000cd05943bfe5..9a6af526cc70e42f601f3b1cdcf07818cef56d4c 100755 (executable)
--- 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 3d255ed91fdf5ec523584f2870bffd1c150da130..0c2c03c98b690519be38e753b255da1c085bae95 100755 (executable)
--- 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() {