From ae88d7390bc743d1a424c3115762556d6c9173ef Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 10 Nov 2011 13:43:43 +0100 Subject: [PATCH] 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. --- source4/scripting/bin/subunitrun | 5 ----- 1 file changed, 5 deletions(-) diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun index 9b3c315d2cf..9c87d2eca3d 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) -- 2.34.1