Bug 1287594 - Allow usage of marionette harness options through mach. r=whimboo
authorclui <clui159@gmail.com>
Fri, 19 Aug 2016 16:35:19 -0700
changeset 310606 a2deef3b5ce0bbddfc66d60c88ef7dab1bad9b4d
parent 310605 563592a6f576181b7288a2ec2d56a99f8e9ab33e
child 310607 ca0db8a96531c273e644a3bf200c2f34554af094
push id30592
push userryanvm@gmail.com
push dateTue, 23 Aug 2016 14:01:40 +0000
treeherdermozilla-central@a522dde88529 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswhimboo
bugs1287594
milestone51.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1287594 - Allow usage of marionette harness options through mach. r=whimboo MozReview-Commit-ID: CJwo4RsCnVg
dom/media/test/external/mach_commands.py
testing/firefox-ui/mach_commands.py
--- a/dom/media/test/external/mach_commands.py
+++ b/dom/media/test/external/mach_commands.py
@@ -14,33 +14,35 @@ from mozbuild.base import (
 
 from mach.decorators import (
     CommandProvider,
     Command,
 )
 
 def setup_argument_parser():
     from external_media_harness.runtests import MediaTestArguments
-    return MediaTestArguments()
+    from mozlog.structured import commandline
+    parser = MediaTestArguments()
+    commandline.add_logging_group(parser)
+    return parser
 
 
 def run_external_media_test(tests, testtype=None, topsrcdir=None, **kwargs):
     from external_media_harness.runtests import (
         FirefoxMediaHarness,
         MediaTestArguments,
         MediaTestRunner,
         mn_cli,
     )
 
     from mozlog.structured import commandline
 
     from argparse import Namespace
 
-    parser = MediaTestArguments()
-    commandline.add_logging_group(parser)
+    parser = setup_argument_parser()
 
     if not tests:
         tests = [os.path.join(topsrcdir,
                  'dom/media/test/external/external_media_tests/manifest.ini')]
 
     args = Namespace(tests=tests)
 
     for k, v in kwargs.iteritems():
--- a/testing/firefox-ui/mach_commands.py
+++ b/testing/firefox-ui/mach_commands.py
@@ -15,22 +15,28 @@ from mozbuild.base import (
 from mach.decorators import (
     Command,
     CommandProvider,
 )
 
 
 def setup_argument_parser_functional():
     from firefox_ui_harness.arguments.base import FirefoxUIArguments
-    return FirefoxUIArguments()
+    from mozlog.structured import commandline
+    parser = FirefoxUIArguments()
+    commandline.add_logging_group(parser)
+    return parser
 
 
 def setup_argument_parser_update():
     from firefox_ui_harness.arguments.update import UpdateArguments
-    return UpdateArguments()
+    from mozlog.structured import commandline
+    parser = UpdateArguments()
+    commandline.add_logging_group(parser)
+    return parser
 
 
 def run_firefox_ui_test(testtype=None, topsrcdir=None, **kwargs):
     from mozlog.structured import commandline
     from argparse import Namespace
     import firefox_ui_harness
 
     if testtype == 'functional':