diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2011-11-10 13:46:01 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2011-11-10 23:37:04 +0100 |
| commit | f5d3e4572234ab28a95a35c87e7b56cf94ab1780 (patch) | |
| tree | 9e826c6013a44103bb7fec7d5eae56c9b4a6d24b | |
| parent | ae88d7390bc743d1a424c3115762556d6c9173ef (diff) | |
| download | samba-f5d3e4572234ab28a95a35c87e7b56cf94ab1780.tar.gz samba-f5d3e4572234ab28a95a35c87e7b56cf94ab1780.tar.bz2 samba-f5d3e4572234ab28a95a35c87e7b56cf94ab1780.zip | |
Revert "test: added directory option to planpythontestsuite()"
This reverts commit b0be72d5080aed3da3f33a45b72f88e90fbe3d13.
I'll add an alternative that uses subunit.run.
| -rw-r--r-- | selftest/selftesthelpers.py | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py index 58a2f0f5d6..085c62c466 100644 --- a/selftest/selftesthelpers.py +++ b/selftest/selftesthelpers.py @@ -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)) + + |