From ed4c07b34b5571c021684e3df6bf5fc63cde69c5 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 1 Nov 2014 20:57:09 -0700 Subject: [PATCH] subunitrun: Use new samba.tests.subunitrun module. Change-Id: Ie32f16d72c80c831adfd9a8d32735fa348962123 Signed-off-by: Jelmer Vernooij Reviewed-by: Andrew Bartlett --- source4/scripting/bin/subunitrun | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun index 918195e8429..c85fc97fb2f 100755 --- a/source4/scripting/bin/subunitrun +++ b/source4/scripting/bin/subunitrun @@ -39,9 +39,8 @@ sys.path.insert(0, "bin/python") import optparse import samba -samba.ensure_external_module("testtools", "testtools") -samba.ensure_external_module("subunit", "subunit/python") -from subunit.run import SubunitTestRunner +from samba.tests.subunitrun import TestProgram + import samba.getopt as options import samba.tests @@ -74,14 +73,6 @@ credopts = options.CredentialsOptions(parser) sambaopts = options.SambaOptions(parser) parser.add_option_group(credopts) parser.add_option_group(sambaopts) -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") opts, args = parser.parse_args() @@ -91,5 +82,4 @@ else: lp = sambaopts.get_loadparm() samba.tests.cmdline_credentials = credopts.get_credentials(lp) -runner = SubunitTestRunner() -program = TestProgram(module=None, argv=[sys.argv[0]] + args, testRunner=runner) +TestProgram(module=None, argv=[sys.argv[0]] + args) -- 2.11.4.GIT