auto_bisect: set proper current working directory for remote_run

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.
 """
 
@@ skipping 29 matching lines @@
     self.override_poll_interval = None
     self.bot_db = None
     # Repo for triggering build jobs.
     self.svn_repo_url = 'svn://svn.chromium.org/chrome-try/try-perf'
     # 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
+
   def perform_bisect(self, **flags):
     return local_bisect.perform_bisect(self, **flags)
 
   def create_bisector(self, bisect_config_dict, dummy_mode=False, **flags):
     """Passes the api and the config dictionary to the Bisector constructor.
 
     For details about the keys in the bisect config dictionary go to:
     http://chromium.org/developers/speed-infra/perf-try-bots-bisect-bots/config
 
     Args:
@@ skipping 140 matching lines @@
 
     if skip_download:
       update_step = None
     else:
       update_step = self._SyncRevisionToTest(test_config_params)
     self.start_test_run_for_bisect(update_step, self.bot_db,
                                    test_config_params, run_locally=True,
                                    skip_download=skip_download)
 
   def ensure_checkout(self, *args, **kwargs):
-    checkout_dir = self.m.chromium_tests.get_checkout_dir({})
-    if checkout_dir:
-      kwargs.setdefault('cwd', checkout_dir)
+    self._working_dir = self.m.chromium_tests.get_checkout_dir({})
+    if self._working_dir:
+      kwargs.setdefault('cwd', self._working_dir)
 
     return self.m.bot_update.ensure_checkout(*args, **kwargs)
 
   def _SyncRevisionToTest(self, test_config_params):  # pragma: no cover
     if not self.internal_bisect:
       return self.ensure_checkout(
           root_solution_revision=test_config_params['revision'])
     else:
       return self._SyncRevisionsForAndroidChrome(
           test_config_params['revision_ladder'])
@@ skipping 137 matching lines @@
     """
     flags = {}
     if kwargs.get('do_not_nest_wait_for_revision'):
       flags['do_not_nest_wait_for_revision'] = kwargs.pop(
           'do_not_nest_wait_for_revision')
     if bot_db is None:  # pragma: no cover
       self.bot_db = api.chromium_tests.create_bot_db_from_master_dict(
           '', None, None)
     else:
       self.bot_db = bot_db
-    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:
-      # 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
+
+    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:
+        # 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('***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(
-            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()
+          api.step('***PERF TRYJOB***', [])
+          self.m.perf_try.start_perf_try_job(
+              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()