summaryrefslogtreecommitdiff
path: root/source4/scripting/bin
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-12-09 19:45:37 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-12-10 03:04:06 +0100
commit4571b94e7b04acaa7f462262dac509843287e4af (patch)
treef8d29c7295ba2570c37f75fa792101dbed3e5236 /source4/scripting/bin
parentc565da0f7148fcfb560bea9abe4b9e2bb59a81e1 (diff)
downloadsamba-4571b94e7b04acaa7f462262dac509843287e4af.tar.gz
samba-4571b94e7b04acaa7f462262dac509843287e4af.tar.bz2
samba-4571b94e7b04acaa7f462262dac509843287e4af.zip
s4-python: Split up ensure_external_module.
Diffstat (limited to 'source4/scripting/bin')
-rwxr-xr-xsource4/scripting/bin/subunitrun3
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 72f6429188..87519d5661 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -22,15 +22,14 @@ import sys
# Find right directory when running from source tree
sys.path.insert(0, "bin/python")
-from subunit.run import TestProgram
import optparse
import samba
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
+from subunit.run import SubunitTestRunner, TestProgram
import samba.getopt as options
import samba.tests
-from subunit.run import SubunitTestRunner
parser = optparse.OptionParser("subunitrun [options] <tests>")
credopts = options.CredentialsOptions(parser)