sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

Revert "test: added directory option to planpythontestsuite()"

Browse Source 
This reverts commit b0be72d508.

I'll add an alternative that uses subunit.run.
This commit is contained in:
Jelmer Vernooij 2011-11-10 13:46:01 +01:00
parent ae88d7390b
commit f5d3e45722
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
selftest/selftesthelpers.py
View File

@ -158,17 +158,10 @@ def planperltestsuite(name, path):
skiptestsuite(name, "Test::More not available")
def planpythontestsuite(env, module, name=None, directory=None):
if name is None:
name = module
def planpythontestsuite(env, module):
if has_system_subunit_run:
cmd = [python, "-m", "subunit.run", "$LISTOPT", module]
if directory is not None:
cmd.extend(['-D', directory])
plantestsuite_idlist(name, env, cmd)
plantestsuite_idlist(module, env, [python, "-m", "subunit.run", "$LISTOPT", module])
else:
cmd = "PYTHONPATH=$PYTHONPATH:%s/lib/subunit/python:%s/lib/testtools %s -m subunit.run $LISTOPT %s" % (srcdir(), srcdir(), python, module)
if directory is not None:
cmd += ' -D %s' % directory
plantestsuite_idlist(name, env, cmd)
plantestsuite_idlist(module, env, "PYTHONPATH=$PYTHONPATH:%s/lib/subunit/python:%s/lib/testtools %s -m subunit.run $LISTOPT %s" % (srcdir(), srcdir(), python, module))