diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2014-11-01 16:36:54 -0700 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2014-11-30 16:43:52 +0100 |
| commit | 02e063bd5be06925489f735c51225b65ff961d6b (patch) | |
| tree | 9197174a3a28c52fa69539233ccb340133f52dfc /source4 | |
| parent | 0f408599f83f5d8e68f0fb0f765143aa6620651e (diff) | |
| download | samba-02e063bd5be06925489f735c51225b65ff961d6b.tar.gz | |
Be consistent about what functions add $LISTOPT and $LOADLIST to the command-line.
Change-Id: Ife86624b53a99d48ce9f00d146b14f798c9bdb24
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date(master): Sun Nov 30 16:43:52 CET 2014 on sn-devel-104
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/selftest/tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 722e065fc30..7362b64c23e 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -313,7 +313,7 @@ plantestsuite("samba4.blackbox.gentest(dc)", "dc", [os.path.join(samba4srcdir, " plantestsuite("samba4.blackbox.rfc2307_mapping(dc:local)", "dc:local", [os.path.join(samba4srcdir, "../nsswitch/tests/test_rfc2307_mapping.sh"), '$DOMAIN', '$USERNAME', '$PASSWORD', "$SERVER", "$UID_RFC2307TEST", "$GID_RFC2307TEST", configuration]) plantestsuite("samba4.blackbox.chgdcpass", "chgdcpass", [os.path.join(bbdir, "test_chgdcpass.sh"), '$SERVER', "CHGDCPASS\$", '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", '$SELFTEST_PREFIX/chgdcpass', smbclient4]) plantestsuite("samba4.blackbox.samba_upgradedns(chgdcpass:local)", "chgdcpass:local", [os.path.join(bbdir, "test_samba_upgradedns.sh"), '$SERVER', '$REALM', '$PREFIX', '$SELFTEST_PREFIX/chgdcpass']) -plantestsuite_loadlist("samba4.rpc.echo against NetBIOS alias", "dc", [valgrindify(smbtorture4), "$LISTOPT", 'ncacn_np:$NETBIOSALIAS', '-U$DOMAIN/$USERNAME%$PASSWORD', 'rpc.echo']) +plantestsuite_loadlist("samba4.rpc.echo against NetBIOS alias", "dc", [valgrindify(smbtorture4), "$LISTOPT", "$LOADLIST", 'ncacn_np:$NETBIOSALIAS', '-U$DOMAIN/$USERNAME%$PASSWORD', 'rpc.echo']) # Tests using the "Simple" NTVFS backend for t in ["base.rw1"]: @@ -432,7 +432,7 @@ def planoldpythontestsuite(env, module, name=None, extra_path=[], environ={}, ex if py_path: environ["PYTHONPATH"] = ":".join(["$PYTHONPATH"] + py_path) args = ["%s=%s" % item for item in environ.iteritems()] - args += [subunitrun, "$LISTOPT", module] + args += [subunitrun, "$LISTOPT", "$LOADLIST", module] args += extra_args if name is None: name = module |