Bug 1566171 - Pre: Allow to not re-install Android app in Raptor locally. r=perftest-reviewers,rwood

This is better than `yes n | mach raptor-test ...`.

Differential Revision: https://phabricator.services.mozilla.com/D38774

--HG--
extra : moz-landing-system : lando

testing/mozharness/mozharness/mozilla/testing/raptor.py

@@ -168,6 +168,12 @@ class Raptor(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidMixin):
             "default": False,
             "help": "Run Raptor in debug mode (open browser console, limited page-cycles, etc.)",
         }],
+        [["--noinstall"], {
+            "dest": "noinstall",
+            "action": "store_true",
+            "default": False,
+            "help": "Do not offer to install Android APK",
+        }],
         [["--disable-e10s"], {
             "dest": "e10s",
             "action": "store_false",

testing/raptor/mach_commands.py

@@ -201,7 +201,9 @@ class MachRaptor(MachCommandBase):
         if is_android:
             from mozrunner.devices.android_device import verify_android_device
             from mozdevice import ADBAndroid, ADBHost
-            if not verify_android_device(build_obj, install=True, app=kwargs['binary'],
+            if not verify_android_device(build_obj,
+                                         install=not kwargs.pop('noinstall', False),
+                                         app=kwargs['binary'],
                                          xre=True):  # Equivalent to 'run_local' = True.
                 return 1
 

testing/raptor/raptor/cmdline.py

@@ -141,6 +141,8 @@ def create_parser(mach_interface=False):
                 help="Flag which indicates if Raptor is running locally or in production")
         add_arg('--obj-path', dest="obj_path", default=None,
                 help="Browser-build obj_path (received when running in production)")
+    add_arg('--noinstall', dest="noinstall", default=False, action="store_true",
+            help="Flag which indicates if Raptor should not offer to install Android APK.")
 
     add_logging_group(parser)
     return parser

testing/raptor/raptor/raptor.py

@@ -85,7 +85,8 @@ either Raptor or browsertime."""
 
     __metaclass__ = ABCMeta
 
-    def __init__(self, app, binary, run_local=False, obj_path=None, profile_class=None,
+    def __init__(self, app, binary, run_local=False, noinstall=False,
+                 obj_path=None, profile_class=None,
                  gecko_profile=False, gecko_profile_interval=None, gecko_profile_entries=None,
                  symbols_path=None, host=None, power_test=False, cpu_test=False, memory_test=False,
                  is_release_build=False, debug_mode=False, post_startup_delay=None,
@@ -1206,6 +1207,7 @@ def main(args=sys.argv[1:]):
     raptor = raptor_class(args.app,
                           args.binary,
                           run_local=args.run_local,
+                          noinstall=args.noinstall,
                           obj_path=args.obj_path,
                           gecko_profile=args.gecko_profile,
                           gecko_profile_interval=args.gecko_profile_interval,