Bug 1323217 - Fix mach marionette-test; r?whimboo
testing/marionette/mach_commands.py contains wrong module imports.
The `marionette` Python package has been renamed to `marionette_harness`.
MozReview-Commit-ID: HrdLNQPoKgc
--- a/testing/marionette/mach_commands.py
+++ b/testing/marionette/mach_commands.py
@@ -19,26 +19,26 @@ from mach.decorators import (
Command,
)
def is_firefox_or_android(cls):
"""Must have Firefox build or Android build."""
return conditions.is_firefox(cls) or conditions.is_android(cls)
def setup_marionette_argument_parser():
- from marionette.runtests import MarionetteArguments
+ from marionette_harness.runtests import MarionetteArguments
from mozlog.structured import commandline
parser = MarionetteArguments()
commandline.add_logging_group(parser)
return parser
def run_marionette(tests, binary=None, topsrcdir=None, **kwargs):
from mozlog.structured import commandline
- from marionette.runtests import (
+ from marionette_harness.runtests import (
MarionetteTestRunner,
MarionetteHarness
)
parser = setup_marionette_argument_parser()
if not tests:
tests = [os.path.join(topsrcdir,