From aa7f384d91c7219831821bcabbc697e41df9ad8b Mon Sep 17 00:00:00 2001 From: Rob Wood Date: Tue, 22 Jan 2019 19:56:58 +0000 Subject: [PATCH] Bug 1517738 - Have Raptor use the correct binary name when running on android in production; r=gbrown Differential Revision: https://phabricator.services.mozilla.com/D17251 --HG-- extra : moz-landing-system : lando --- testing/mozharness/mozharness/mozilla/testing/raptor.py | 5 +++++ testing/raptor/raptor/raptor.py | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/testing/mozharness/mozharness/mozilla/testing/raptor.py b/testing/mozharness/mozharness/mozilla/testing/raptor.py index 89ae185bcc7c..5f55e16825ce 100644 --- a/testing/mozharness/mozharness/mozilla/testing/raptor.py +++ b/testing/mozharness/mozharness/mozilla/testing/raptor.py @@ -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 diff --git a/testing/raptor/raptor/raptor.py b/testing/raptor/raptor/raptor.py index 104630e19324..646ef1f99c34 100644 --- a/testing/raptor/raptor/raptor.py +++ b/testing/raptor/raptor/raptor.py @@ -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'])