diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2014-11-02 09:39:17 -0800 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2014-11-22 02:23:10 +0100 |
| commit | cfb5e9bbf2bde885c50097ab0a2914c674e65860 (patch) | |
| tree | 91d7a5e28a6dc7c2063b9f068249e95e51c441cb /source4/selftest | |
| parent | 6fb26c0e29d74c793f8714b057e0ed0e5ee0cc37 (diff) | |
| download | samba-cfb5e9bbf2bde885c50097ab0a2914c674e65860.tar.gz samba-cfb5e9bbf2bde885c50097ab0a2914c674e65860.tar.xz samba-cfb5e9bbf2bde885c50097ab0a2914c674e65860.zip | |
deletetest: use samba.tests.subunitrun.
Change-Id: I13565c7c14ea186709ce1de9038ef840c5b766b8
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/selftest')
| -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 f12e9e4f72..e1652bc572 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -486,9 +486,9 @@ for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]: planpythontestsuite("dc:local", "samba.tests.upgradeprovisionneeddc") planpythontestsuite("plugin_s4_dc:local", "samba.tests.posixacl") -plantestsuite("samba4.deletetest.python(dc)", "dc", ['PYTHONPATH="$PYTHONPATH:%s/lib/subunit/python:%s/lib/testtools"' % (srcdir(), srcdir()), +plantestsuite_loadlist("samba4.deletetest.python(dc)", "dc", ['PYTHONPATH="$PYTHONPATH:%s/lib/subunit/python:%s/lib/testtools"' % (srcdir(), srcdir()), python, os.path.join(samba4srcdir, "dsdb/tests/python/deletetest.py"), - '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN']) + '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT']) plantestsuite("samba4.blackbox.samba3dump", "none", ['PYTHONPATH="$PYTHONPATH:%s/lib/subunit/python:%s/lib/testtools"' % (srcdir(), srcdir()), os.path.join(samba4srcdir, "selftest/test_samba3dump.sh")]) plantestsuite("samba4.blackbox.upgrade", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_s3upgrade.sh"), '$PREFIX/provision']) plantestsuite("samba4.blackbox.provision.py", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_provision.sh"), '$PREFIX/provision']) |