sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

Use samba.subunit.run to run subunit tests.

Browse Source 
Change-Id: Id9bdd33b7ac5e4db40ab8bef4dbe0f04c36d8da7
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Jelmer Vernooij 2014-12-11 01:16:38 +00:00 committed by Andrew Bartlett
parent 4dae2d6af8
commit de60dfd389
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
selftest/selftesthelpers.py
View File

@ -58,13 +58,6 @@ if subprocess.call(perl + ["-e", "eval require Test::More;"]) == 0:
else:
has_perl_test_more = False
try:
from subunit.run import TestProgram
except ImportError:
has_system_subunit_run = False
else:
has_system_subunit_run = True
python = os.getenv("PYTHON", "python")
# Set a default value, overridden if we find a working one on the system
@ -166,13 +159,7 @@ def planpythontestsuite(env, module, name=None, extra_path=[]):
if name is None:
name = module
pypath = list(extra_path)
if not has_system_subunit_run:
pypath.extend([
"%s/lib/subunit/python" % srcdir(),
"%s/lib/testtools" % srcdir(),
"%s/lib/extras" % srcdir(),
"%s/lib/mimeparse" % srcdir()])
args = [python, "-m", "subunit.run", "$LISTOPT", "$LOADLIST", module]
args = [python, "-m", "samba.subunit.run", "$LISTOPT", "$LOADLIST", module]
if pypath:
args.insert(0, "PYTHONPATH=%s" % ":".join(["$PYTHONPATH"] + pypath))
plantestsuite_loadlist(name, env, args)