Bug 1517738 - [raptor] Use the correct app name when running on fennec on beta; r=davehunt
authorRob Wood <rwood@mozilla.com>
Fri, 11 Jan 2019 19:25:22 +0000
changeset 453526 e920686642fa
parent 453525 e5caca48603e
child 453527 4195353da58d
push id35360
push usernbeleuzu@mozilla.com
push dateSat, 12 Jan 2019 09:39:47 +0000
treeherdermozilla-central@cb35977ae7a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdavehunt
bugs1517738
milestone66.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 1517738 - [raptor] Use the correct app name when running on fennec on beta; r=davehunt Differential Revision: https://phabricator.services.mozilla.com/D16209
testing/raptor/raptor/raptor.py
--- a/testing/raptor/raptor/raptor.py
+++ b/testing/raptor/raptor/raptor.py
@@ -308,16 +308,24 @@ class Raptor(object):
                                                 fail_if_running=False)
                 except Exception:
                     self.log.error("Exception launching %s" % self.config['binary'])
                     if self.config['power_test']:
                         finish_geckoview_power_test(self)
                     raise
             else:
                 # launch fennec
+
+                # when running locally the 'binary' is provided on the mach raptor-test cmd line,
+                # i.e. `org.mozilla.fennec_aurora` for fennec nightly
+                # in production the default `.fennec_aurora` comes form the tc config;
+                # if we're running in production but on beta that needs to be changed to `.fennec`
+                if not self.config['run_local'] and self.config['is_release_build']:
+                    self.config['binary'] = 'org.mozilla.fennec'
+
                 try:
                     # if fennec is already running, shut it down first
                     self.device.stop_application(self.config['binary'])
                     self.device.launch_fennec(self.config['binary'],
                                               extra_args=extra_args,
                                               url='about:blank',
                                               fail_if_running=False)
                 except Exception: