mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 03:45:46 +00:00
1abba2da72
Previously the run-wizard script would add a command to source the virtualenv in ~/.bashrc after mozharness finished setting things up. This is fragile, assumes people are using bash, etc. Plus it appeared to intermittently fail for some users. Instead, this activates the virtualenv directly from individual mach commands that need it. This guarantees we will always be using the virtualenv if required (and won't be using it if not). The 'activate_this.py' script is invoked the same way that we do it for in-tree mach commands: https://dxr.mozilla.org/mozilla-central/rev/9c06e744b1befb3a2e2fdac7414ce18220774a1d/python/mozbuild/mozbuild/virtualenv.py#456 MozReview-Commit-ID: CfcoiVJXQTl --HG-- extra : rebase_source : da01d1ce1bd9b41c89922e989f857c4de8c09341
69 lines
2.1 KiB
Python
69 lines
2.1 KiB
Python
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
import argparse
|
|
import os
|
|
import sys
|
|
from functools import partial
|
|
|
|
from mach.decorators import (
|
|
CommandProvider,
|
|
Command,
|
|
)
|
|
|
|
parser = None
|
|
|
|
|
|
def run_marionette(context, **kwargs):
|
|
from marionette.runtests import (
|
|
MarionetteTestRunner,
|
|
MarionetteHarness
|
|
)
|
|
from mozlog.structured import commandline
|
|
|
|
|
|
args = argparse.Namespace(**kwargs)
|
|
args.binary = args.binary or context.firefox_bin
|
|
args.e10s = context.mozharness_config.get('e10s', args.e10s)
|
|
|
|
test_root = os.path.join(context.package_root, 'marionette', 'tests')
|
|
if not args.tests:
|
|
args.tests = [os.path.join(test_root, 'testing', 'marionette', 'harness',
|
|
'marionette_harness', 'tests', 'unit-tests.ini')]
|
|
|
|
normalize = partial(context.normalize_test_path, test_root)
|
|
args.tests = map(normalize, args.tests)
|
|
|
|
commandline.add_logging_group(parser)
|
|
parser.verify_usage(args)
|
|
|
|
args.logger = commandline.setup_logging("Marionette Unit Tests",
|
|
args,
|
|
{"mach": sys.stdout})
|
|
status = MarionetteHarness(MarionetteTestRunner, args=vars(args)).run()
|
|
return 1 if status else 0
|
|
|
|
|
|
def setup_marionette_argument_parser():
|
|
from marionette.runner.base import BaseMarionetteArguments
|
|
global parser
|
|
parser = BaseMarionetteArguments()
|
|
return parser
|
|
|
|
|
|
@CommandProvider
|
|
class MachCommands(object):
|
|
|
|
def __init__(self, context):
|
|
self.context = context
|
|
|
|
@Command(
|
|
'marionette-test', category='testing',
|
|
description='Run a Marionette test (Check UI or the internal JavaScript '
|
|
'using marionette).',
|
|
parser=setup_marionette_argument_parser)
|
|
def run_marionette_test(self, **kwargs):
|
|
self.context.activate_mozharness_venv()
|
|
return run_marionette(self.context, **kwargs)
|