Bug 1323217 - Fix mach marionette-test; r?whimboo draft
authorAndreas Tolfsen <ato@mozilla.com>
Tue, 13 Dec 2016 16:58:16 +0000
changeset 449251 655f1116a049af96431b2da5140c8656adf27ec0
parent 449020 cb369201f52f7f4c9cb35c3e7dca9262b13f006b
child 539452 f979be2cf361bd002fd7149e4a3e684be5081425
push id38521
push userbmo:ato@mozilla.com
push dateTue, 13 Dec 2016 17:01:01 +0000
reviewerswhimboo
bugs1323217
milestone53.0a1
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
testing/marionette/mach_commands.py
--- 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,