diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2014-12-14 20:27:42 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2015-03-06 04:41:48 +0100 |
| commit | e59f2602f1f89f9d2a9b15a614ab0d86da5adc4e (patch) | |
| tree | 7e32307a6ecf0cf667948f15f2bc2b3277783cec /source4/selftest | |
| parent | 850b3938e151707470044478a540d4573b25f72f (diff) | |
| download | samba-e59f2602f1f89f9d2a9b15a614ab0d86da5adc4e.tar.gz samba-e59f2602f1f89f9d2a9b15a614ab0d86da5adc4e.tar.xz samba-e59f2602f1f89f9d2a9b15a614ab0d86da5adc4e.zip | |
Remove unnecessary python path updates for bundled subunit/testtools.
Change-Id: Idb40fcb564455f16608ea991b086e41e22ae51e3
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 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 60860389f2..a104e43edf 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -493,10 +493,9 @@ for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]: planpythontestsuite("dc:local", "samba.tests.upgradeprovisionneeddc") planpythontestsuite("plugin_s4_dc:local", "samba.tests.posixacl") -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"), +plantestsuite_loadlist("samba4.deletetest.python(dc)", "dc", [python, os.path.join(samba4srcdir, "dsdb/tests/python/deletetest.py"), '$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.samba3dump", "none", [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']) plantestsuite("samba4.blackbox.upgradeprovision.current", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_upgradeprovision.sh"), '$PREFIX/provision']) |