From b0be72d5080aed3da3f33a45b72f88e90fbe3d13 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 9 Nov 2011 13:10:24 +1100 Subject: [PATCH] test: added directory option to planpythontestsuite() Pair-Programmed-With: Amitay Isaacs --- selftest/selftesthelpers.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py index 085c62c4660..58a2f0f5d67 100644 --- a/selftest/selftesthelpers.py +++ b/selftest/selftesthelpers.py @@ -158,10 +158,17 @@ def planperltestsuite(name, path): skiptestsuite(name, "Test::More not available") -def planpythontestsuite(env, module): +def planpythontestsuite(env, module, name=None, directory=None): + + if name is None: + name = module if has_system_subunit_run: - plantestsuite_idlist(module, env, [python, "-m", "subunit.run", "$LISTOPT", module]) + cmd = [python, "-m", "subunit.run", "$LISTOPT", module] + if directory is not None: + cmd.extend(['-D', directory]) + plantestsuite_idlist(name, env, cmd) else: - plantestsuite_idlist(module, env, "PYTHONPATH=$PYTHONPATH:%s/lib/subunit/python:%s/lib/testtools %s -m subunit.run $LISTOPT %s" % (srcdir(), srcdir(), python, module)) - - + 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) -- 2.34.1