summaryrefslogtreecommitdiff
path: root/source4/scripting/bin
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-11-10 13:43:43 +0100
committerJelmer Vernooij <jelmer@samba.org>2011-11-10 23:37:04 +0100
commitae88d7390bc743d1a424c3115762556d6c9173ef (patch)
tree28c909c2a44ecc45baf31a020ec9073fe7836a46 /source4/scripting/bin
parent04be49f60091b54f6ab7cf2920b590b3f758ca81 (diff)
downloadsamba-ae88d7390bc743d1a424c3115762556d6c9173ef.tar.gz
samba-ae88d7390bc743d1a424c3115762556d6c9173ef.tar.bz2
samba-ae88d7390bc743d1a424c3115762556d6c9173ef.zip
Revert "test: added -D option to subunitrun"
This reverts commit ac0bba2ea18e2e9ac578a333a3b260951e4c976e. "python -m subunit.run" is the preferred way of running tests to generate subunit. I also don't want to move too far away from the standard test running infrastructure for python so that other test runners (nosetests, trial, tribunal, ...) can be used with Samba code.
Diffstat (limited to 'source4/scripting/bin')
-rwxr-xr-xsource4/scripting/bin/subunitrun5
1 files changed, 0 insertions, 5 deletions
diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 9b3c315d2c..9c87d2eca3 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -56,8 +56,6 @@ credopts = options.CredentialsOptions(parser)
sambaopts = options.SambaOptions(parser)
parser.add_option_group(credopts)
parser.add_option_group(sambaopts)
-parser.add_option('-D', '--directory', dest='directory', default=None,
- help='set test directory')
try:
from subunit.run import TestProgram
except ImportError:
@@ -74,8 +72,5 @@ samba.tests.cmdline_credentials = credopts.get_credentials(lp)
if getattr(opts, "listtests", False):
args.insert(0, "--list")
-if opts.directory:
- sys.path.append(opts.directory)
-
runner = SubunitTestRunner()
program = TestProgram(module=None, argv=[sys.argv[0]] + args, testRunner=runner)