Bug 1252586 - Handle |mach firefox-ui-test --binary| correctly - r=whimboo, r=gps draft
authorSyd Polk <spolk@mozilla.com>
Wed, 02 Mar 2016 11:02:11 -0600
changeset 336136 b46993cffe54bcf40942e180ac9d060cbe0161bd
parent 335780 a4929411c0aa3ec6b727e2bc2fc050c8199c6573
child 515319 e21b996815e151c136ab7cb54e4fb52b6fd7b0f5
push id11987
push userspolk@mozilla.com
push dateWed, 02 Mar 2016 17:04:17 +0000
reviewerswhimboo, gps
bugs1252586
milestone47.0a1
Bug 1252586 - Handle |mach firefox-ui-test --binary| correctly - r=whimboo, r=gps MozReview-Commit-ID: KpncN1uAHUn
testing/firefox-ui/mach_commands.py
--- a/testing/firefox-ui/mach_commands.py
+++ b/testing/firefox-ui/mach_commands.py
@@ -55,10 +55,10 @@ def run_firefox_ui_test(tests, testtype=
 @CommandProvider
 class MachCommands(MachCommandBase):
     @Command('firefox-ui-test', category='testing',
              description='Run Firefox UI functional tests.',
              conditions=[conditions.is_firefox],
              parser=setup_argument_parser,
              )
     def run_firefox_ui_test(self, tests, **kwargs):
-        kwargs['binary'] = self.get_binary_path('app')
+        kwargs['binary'] = kwargs['binary'] or self.get_binary_path('app')
         return run_firefox_ui_test(tests, topsrcdir=self.topsrcdir, **kwargs)