Revert of Redo test after step failure if multiple android devices are connected to lin…

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 22 matching lines @@
   # Email to send on try jobs (for build requests) since git try will not
   # necessarily rely on a local checkout for that information.
   BOT_EMAIL = 'chrome_bot@chromium.org'
   SERVICE_ACCOUNT = 'chromium_bisect'
 
   def __init__(self, *args, **kwargs):
     super(AutoBisectApi, self).__init__(*args, **kwargs)
     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'
+    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
 
-
   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 88 matching lines @@
             'author': commit_info['author']['name'],
             'email': commit_info['author']['email'],
             'subject': subject,
             'body': body,
             'date': commit_info['committer']['time'],
        }
      return None
     except self.m.step.StepFailure:  # pragma: no cover
      self.surface_result('BAD_REV')
      raise
-
+     
 
   def run_bisect_script(self, **kwargs):
     """Executes src/tools/run-perf-bisect-regression.py to perform bisection."""
     self.m.python(
         'Preparing for Bisection',
         script=self.m.path['checkout'].join(
             'tools', 'prepare-bisect-perf-regression.py'),
         args=['-w', self.m.path['slave_build']])
     args = []
 
@@ skipping 147 matching lines @@
     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
     """Install android-chrome apk on device."""
     full_deploy_flags = [
         '-v',
         '--blacklist-file', self.m.chromium_android.blacklist_file,
         '--perfbot',
-        '--release',
+        '--release',        
     ]
     if args:
       full_deploy_flags += args
     self.m.python(
         'Deploy on Device',
         deploy_script,
         full_deploy_flags,
         infra_step=True,
         env=self.m.chromium.get_env())
-
+  
   def start_try_job(self, api, update_step=None, bot_db=None, **kwargs):
     """Starts a recipe bisect job, perf test run, or legacy bisect run.
 
     This function is an entry point for:
       1. A legacy bisect job run (in this case, there will be a patch
          with a bisect config file).
       2. A recipe bisect job run (in this case, there will be a property
          called bisect_config which contains the config parameters).
       3. A single test run for a recipe bisect job (there will be a
          bisect_config property but it won't contain good/bad revisions).
@@ skipping 38 matching lines @@
             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:
           api.bot_update.ensure_checkout()
         api.chromium_android.common_tests_final_steps()