Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 02:25:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1517738 - Have Raptor use the correct binary name when running on android in production; r=gbrown

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D17251

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Rob Wood 2019-01-22 19:56:58 +00:00
parent 73788254d5
commit aa7f384d91
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
testing/mozharness/mozharness/mozilla/testing/raptor.py
View File

@ -337,6 +337,11 @@ class Raptor(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidMixin):
if not binary_path:
self.fatal("Raptor requires a path to the binary.")
kw_options['binary'] = binary_path
if self.app in["geckoview", "fennec"]:
# in production ensure we have correct app name,
# i.e. fennec_aurora or fennec_release etc.
kw_options['binary'] = self.query_package_name()
self.info("set binary to %s instead of %s" % (kw_options['binary'], binary_path))
else: # running on google chrome
if not self.run_local:
# when running locally we already set the chrome binary above in init; here

8
testing/raptor/raptor/raptor.py
View File

@ -314,14 +314,6 @@ class Raptor(object):
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'])