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

scripts/slave/recipe_modules/auto_bisect/api.py

 # Copyright 2015 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.
 
 """API for the bisect recipe module.
 
 This API is meant to enable the bisect recipe to bisect any chromium-supported
 platform for any test that can be run via buildbot, perf or otherwise.
 """
 
+import contextlib
 import os
 
 from recipe_engine import recipe_api
 from . import bisector
 from . import depot_config
 from . import revision_state
 from . import local_bisect
 
 BISECT_CONFIG_FILE = 'tools/auto_bisect/bisect.cfg'
 
@@ skipping 23 matching lines @@
     # The variable below are set and used for the internal bisects.
     self.buildurl_gs_prefix = None
     self.internal_bisect = False
     self.builder_bot = None
     self.full_deploy_script = None
 
     # Keep track of working directory (which contains the checkout).
     # None means "default value".
     self._working_dir = None
 
+    @contextlib.contextmanager
+    def noop_context_manager(_api):
+      """This is a context manager that doesn't do anything.
+
+      It is used for a placeholder for code that should be wrapped around ever

[RobertoCN, 2016/11/08 19:16:56]

nit: every

+      test execution of a bisect iteration or full build. Replace it with a
+      real context manager (one that accepts an api argument) to do something
+      useful.
+      """
+      yield
+
+    # test_context_mgr is run for each overall bisect run (i.e., once).

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

build_context_mgr

+    self.build_context_mgr = noop_context_manager
+    # test_context_mgr is run for each iteration of the bisect.
+    self.test_context_mgr = noop_context_manager
+
   @property
   def working_dir(self):
    if not self._working_dir:
      self._working_dir = self.m.chromium_checkout.get_checkout_dir({})
    return self._working_dir or self.m.path['slave_build']
 
   def perform_bisect(self, **flags):
     return local_bisect.perform_bisect(self, **flags)
 
   def create_bisector(self, bisect_config_dict, dummy_mode=False, **flags):
@@ skipping 238 matching lines @@
 
     if not tests:  # pragma: no cover
       return
     self.m.chromium_swarming.configure_swarming(
         'chromium', precommit=False, mastername=mastername)
     test_runner = self.m.chromium_tests.create_test_runner(self.m, tests)
 
     bot_config_object = self.m.chromium_tests.create_bot_config_object(
         mastername, buildername)
     with self.m.chromium_tests.wrap_chromium_tests(bot_config_object, tests):
-      if self.m.chromium.c.TARGET_PLATFORM == 'android' and not skip_download:
-        deploy_apks = []
-        deploy_args = []
-        if self.internal_bisect:  # pragma: no cover
-          deploy_args = list(bot_config['deploy_args'])
-          deploy_apks = bot_config.get('deploy_apks')
-          if deploy_apks:
-            deploy_args.extend([
-              '--apks',
-              ','.join(str(self.m.chromium_android.apk_path(apk))
-                       for apk in deploy_apks)])
-        else:

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

diff didn't like this indent for some reason

-          if bot_config.get('webview'):
-            deploy_apks = ['SystemWebView.apk', 'SystemWebViewShell.apk']
+      with self.test_context_mgr(self.m):
+        if self.m.chromium.c.TARGET_PLATFORM == 'android' and not skip_download:

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

I would have added this part to the context manager but I was worried about the
skip_download thing

+          deploy_apks = []
+          deploy_args = []
+          if self.internal_bisect:  # pragma: no cover
+            deploy_args = list(bot_config['deploy_args'])
+            deploy_apks = bot_config.get('deploy_apks')
+            if deploy_apks:
+              deploy_args.extend([
+                '--apks',
+                ','.join(str(self.m.chromium_android.apk_path(apk))
+                         for apk in deploy_apks)])
           else:
-            deploy_apks = ['ChromePublic.apk']
-        self.deploy_apk_on_device(
-            self.full_deploy_script, deploy_apks, deploy_args)
-      test_runner()
+            if bot_config.get('webview'):
+              deploy_apks = ['SystemWebView.apk', 'SystemWebViewShell.apk']
+            else:
+              deploy_apks = ['ChromePublic.apk']
+          self.deploy_apk_on_device(
+              self.full_deploy_script, deploy_apks, deploy_args)
+        test_runner()
 
   def deploy_apk_on_device(self, deploy_script, deploy_apks, deploy_args):
     """Installs apk on the android device."""
     if deploy_script:  # pragma: no cover
       self.full_deploy_on_device(deploy_script, deploy_args)
     else:
       for apk in deploy_apks:
         self.m.chromium_android.adb_install_apk(apk)
 
   def full_deploy_on_device(self, deploy_script, args=None):  # pragma: no cover
@@ skipping 41 matching lines @@
           '', None, None)
     else:
       self.bot_db = bot_db
 
     context = {}
     if self.working_dir:
       context['cwd'] = self.working_dir
 
     with api.step.context(context):
       affected_files = self.m.tryserver.get_files_affected_by_patch()
-      # Skip device setup for internal bisect as it is taken care in
-      # internal recipes.
-      if (api.chromium.c.TARGET_PLATFORM == 'android' and
-          not self.internal_bisect):
-        api.chromium_android.common_tests_setup_steps(
-            perf_setup=True, remove_system_webview=True)
-        api.chromium.runhooks()
-      try:
+      with self.build_context_mgr(api):

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

😎

         # Run legacy bisect script if the patch contains bisect.cfg.
         if BISECT_CONFIG_FILE in affected_files:
           api.step('***LEGACY BISECT (deprecated)***', [])
           self.run_bisect_script(**kwargs)
         elif api.properties.get('bisect_config'):
           # We can distinguish between a config for a full bisect vs a single
           # test by checking for the presence of the good_revision key.
           if api.properties.get('bisect_config').get('good_revision'):
             api.step('***BISECT***', [])
             local_bisect.perform_bisect(self, **flags)  # pragma: no cover
           else:
             api.step('***SINGLE TEST (deprecated)***', [])
             self.start_test_run_for_bisect(update_step, self.bot_db,
                                            api.properties)
         else:
           api.step('***PERF TRYJOB***', [])
           self.m.perf_try.start_perf_try_job(
               api, affected_files, update_step, self.bot_db)
-      finally:
-        if api.chromium.c.TARGET_PLATFORM == 'android':
-          if self.internal_bisect:  # pragma: no cover
-            api.chromium_android.init_and_sync(
-                gclient_config=api.chromium_android.c.internal_dir_name,
-                use_bot_update=True)
-          else:
-            self.ensure_checkout()
-          api.chromium_android.common_tests_final_steps()