Changeset 745 for trunk/server/source4/scripting/bin/subunitrun

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/scripting/bin/subunitrun (modified) (2 diffs)

trunk/server/source4/scripting/bin/subunitrun

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Simple subunit testrunner for python
@@ -22 +22 @@
 # Find right directory when running from source tree
 sys.path.insert(0, "bin/python")
-sys.path.insert(1, "../lib/subunit/python")
 
-from subunit import SubunitTestRunner
-from unittest import TestProgram
 import optparse
-import os
-from samba 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))
+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")
 
-args = parser.parse_args()[1]
+opts, args = parser.parse_args()
 
-samba.tests.cmdline_loadparm = sambaopts.get_loadparm()
-samba.tests.cmdline_credentials = credopts.get_credentials(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()