Use devil's adb with each bisect iteration, also start/stop daemons.

scripts/slave/recipe_modules/chromium_android/api.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import contextlib
 import datetime
 import json
 import os
 import pipes
 import re
 import sys
 import textwrap
 import urllib
 
 from recipe_engine.types import freeze
 from recipe_engine import recipe_api
 
 def _TimestampToIsoFormat(timestamp):
   return datetime.datetime.utcfromtimestamp(timestamp).strftime('%Y%m%dT%H%M%S')
 
 
 class AndroidApi(recipe_api.RecipeApi):
   def __init__(self, **kwargs):
     super(AndroidApi, self).__init__(**kwargs)
     self._devices = None
     self._file_changes_path = None
+    self.logcat_gs_bucket = 'chromium-android'
 
   def get_config_defaults(self):
     return {
       'REVISION': self.m.properties.get('revision', ''),
       'CHECKOUT_PATH': self.m.path['checkout'],
     }
 
   @property
   def devices(self):
     assert self._devices is not None,\
@@ skipping 275 matching lines @@
     # TODO(jbudorick): Remove this after resolving
     # https://github.com/catapult-project/catapult/issues/2901
     devil_path = self.m.path['checkout'].join('third_party', 'catapult', 'devil')
     self.m.python.inline(
         'initialize devil',
         """
         import sys
         sys.path.append(sys.argv[1])
         from devil import devil_env
         devil_env.config.Initialize()
         devil_env.config.PrefetchPaths(dependencies=['adb'])

[jbudorick, 2016/11/08 00:18:31]

We might want to modify this to also start the adb server, i.e. add

  from devil.android.sdk import adb_wrapper
  ...
  adb_wrapper.AdbWrapper.StartServer()

         """,
         args=[devil_path])
     self.m.adb.set_adb_path(
         devil_path.join('bin', 'deps', 'linux2', 'x86_64', 'bin', 'adb'))
 
   def create_adb_symlink(self):
     # Creates a sym link to the adb executable in the home dir
     self.m.python(
         'create adb symlink',
         self.m.path['checkout'].join('build', 'symlink.py'),
@@ skipping 813 matching lines @@
     else:
       kwargs = {}
     if skip_wipe:
       kwargs['skip_wipe'] = True
     self.provision_devices(remove_system_webview=remove_system_webview,
                            **kwargs)
     self.device_status()
     if self.m.chromium.c.gyp_env.GYP_DEFINES.get('asan', 0) == 1:
       self.asan_device_setup()
 
-  def common_tests_final_steps(self, logcat_gs_bucket='chromium-android'):

[ghost stip (do not use), 2016/11/07 23:57:48]

I had to pull this out so that we could make the logic in the context manager
cleaner. I checked and it doesn't seem like people use anything except the
defaults anyway.

[jbudorick, 2016/11/08 00:18:31]

You could also do something like

  def create_android_test_wrapper(self, gs_bucket):
    @contextlib.contextmanager
    def android_build_wrapper(api):
      ...

    return android_build_wrapper

[ghost stip (do not use), 2016/11/08 20:56:33]

logcat_dump might be called outside of it though, and presumably you'd want them
in the same location

[jbudorick, 2016/11/08 21:37:08]

At that point, I think it's on the caller.

We could also do this w/ a config setting.

+  def common_tests_final_steps(self):
     self.shutdown_device_monitor()
-    self.logcat_dump(gs_bucket=logcat_gs_bucket)
+    self.logcat_dump(gs_bucket=self.logcat_gs_bucket)
     self.stack_tool_steps()
     if self.m.chromium.c.gyp_env.GYP_DEFINES.get('asan', 0) == 1:
       self.asan_device_teardown()
     self.test_report()
 
+  @contextlib.contextmanager
+  def android_build_wrapper(self, api):
+    """A context manager for use as auto_bisect's build_context_mgr.
+
+    This wraps every overall bisect run.
+    """
+    try:
+      api.chromium_android.common_tests_setup_steps(
+          perf_setup=True, remove_system_webview=True)
+      api.chromium.runhooks()
+
+      yield
+    finally:
+      api.auto_bisect.ensure_checkout()
+      api.chromium_android.common_tests_final_steps()
+
+  @contextlib.contextmanager
+  def android_test_wrapper(self, api):
+    """A context manager for use as auto_bisect's test_context_mgr.
+
+    This wraps each individual bisect test.
+    """
+    try:
+      self.use_devil_adb()

[ghost stip (do not use), 2016/11/07 23:57:48]

this is the "new logic" of the CL. does it look okay?

[jbudorick, 2016/11/08 00:18:31]

I'm not sure that we'll want to do this every time we use android_test_wrapper.

[ghost stip (do not use), 2016/11/08 20:56:32]

isn't that the whole point of doing this work?

[jbudorick, 2016/11/08 21:37:08]

For bisect, yes. I would be interested in using this beyond bisect.

+      self.spawn_logcat_monitor()
+      self.spawn_device_monitor()
+
+      yield
+    finally:
+      self.shutdown_device_monitor()
+      self.logcat_dump(gs_bucket=self.logcat_gs_bucket)
+      self.stack_tool_steps()

[ghost stip (do not use), 2016/11/07 23:57:48]

do we need this? do we want it?

[jbudorick, 2016/11/08 00:18:31]

Yes and yes. Us not having stack symbolization on the swarming bots has been a
bit of an issue.

[ghost stip (do not use), 2016/11/08 20:56:32]

ok, I wasn't sure if I was duplicating some other logic somewhere

+
   def run_bisect_script(self, extra_src='', path_to_config='', **kwargs):
     self.m.step('prepare bisect perf regression',
         [self.m.path['checkout'].join('tools',
                                       'prepare-bisect-perf-regression.py'),
          '-w', self.m.path['slave_build']])
 
     args = []
     if extra_src:
       args = args + ['--extra_src', extra_src]
     if path_to_config:
@@ skipping 440 matching lines @@
       script = self.c.test_runner
       if wrapper_script_suite_name:
         script = self.m.chromium.output_dir.join('bin', 'run_%s' %
                                                  wrapper_script_suite_name)
       else:
         env = kwargs.get('env', {})
         env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR',
                                              self.m.chromium.output_dir)
         kwargs['env'] = env
       return self.m.python(step_name, script, args, **kwargs)