test: added directory option to planpythontestsuite()

Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>

diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index 085c62c46602b38ef15c76bf565b700977dfe174..58a2f0f5d67b85229b399350011be76cc5d43a3b 100644 (file)
--- 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)