sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

subunitrun: Use new samba.subunit.run module.

Browse Source 
Change-Id: I4a4d2237ec9ef090bf95a0ea57285610047451e5
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Jelmer Vernooij 2014-12-11 01:12:11 +00:00 committed by Andrew Bartlett
parent 3f1ecfd2d0
commit 44a561fa45
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python/samba/tests/subunitrun.py
View File

@ -35,16 +35,9 @@ import signal
signal.signal(signal.SIGINT, signal.SIG_DFL) signal.signal(signal.SIGINT, signal.SIG_DFL)
import optparse import optparse
import samba
import sys import sys
import samba.tests
samba.ensure_external_module("subunit", "subunit/python")
import subunit.run
try: from samba.subunit.run import TestProgram as BaseTestProgram
from subunit.run import TestProgram as BaseTestProgram
except ImportError:
from unittest import TestProgram as BaseTestProgram
class SubunitOptions(optparse.OptionGroup): class SubunitOptions(optparse.OptionGroup):
@ -69,5 +62,4 @@ class TestProgram(BaseTestProgram):
if getattr(opts, 'load_list', None): if getattr(opts, 'load_list', None):
args.insert(0, "--load-list=%s" % opts.load_list) args.insert(0, "--load-list=%s" % opts.load_list)
argv = [sys.argv[0]] + args argv = [sys.argv[0]] + args
super(TestProgram, self).__init__(module=module, argv=argv, super(TestProgram, self).__init__(module=module, argv=argv)
testRunner=subunit.run.SubunitTestRunner())