-#!/usr/bin/python
+#!/usr/bin/env python
# Simple subunit testrunner for python
# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-from subunit import SubunitTestRunner
import sys
-from unittest import TestProgram
+
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
+
import optparse
-import os
-import param
+import samba
+samba.ensure_external_module("testtools", "testtools")
+samba.ensure_external_module("subunit", "subunit/python")
+from subunit.run import SubunitTestRunner
import samba.getopt as options
import samba.tests
+
parser = optparse.OptionParser("subunitrun [options] <tests>")
credopts = options.CredentialsOptions(parser)
parser.add_option_group(credopts)
-sambaopts = options.SambaOptions(parser)
-parser.add_option_group(sambaopts)
-parser.add_option_group(options.VersionOptions(parser))
-
-args = parser.parse_args()[1]
+try:
+ from subunit.run import TestProgram
+except ImportError:
+ from unittest import TestProgram
+else:
+ parser.add_option('-l', '--list', dest='listtests', default=False,
+ help='List tests rather than running them.',
+ action="store_true")
-samba.tests.cmdline_loadparm = sambaopts.get_loadparm()
-samba.tests.cmdline_credentials = credopts.get_credentials(samba.tests.cmdline_loadparm)
+opts, args = parser.parse_args()
-param.cvar.default_config = samba.tests.cmdline_loadparm
+samba.tests.cmdline_credentials = credopts.get_credentials(samba.tests.env_loadparm())
+if getattr(opts, "listtests", False):
+ args.insert(0, "--list")
runner = SubunitTestRunner()
program = TestProgram(module=None, argv=[sys.argv[0]] + args, testRunner=runner)