Revert of Iteratively increase sample size for good/bad classification.

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 122 matching lines @@
     args += [
         '--build-properties',
         self.m.json.dumps(dict(self.m.properties.legacy())),
     ]
     self.m.chromium.runtest(
         self.m.path['checkout'].join('tools', 'run-bisect-perf-regression.py'),
         ['-w', self.m.path['slave_build']] + args,
         name='Running Bisection',
         xvfb=True, **kwargs)
 
-  def run_local_test_run(self, api, test_config_params,
-                         skip_download=False):  # pragma: no cover
+  def run_local_test_run(self, api, test_config_params):  # pragma: no cover
     """Starts a test run on the same machine.
 
     This is for the merged director/tester flow.
     """
     if self.m.platform.is_win:
       self.m.chromium.taskkill()
-
-    if skip_download:
-      update_step = None
-    else:
-      update_step = api.bot_update.ensure_checkout(
-          root_solution_revision=test_config_params['revision'])
+    update_step = api.bot_update.ensure_checkout(
+        root_solution_revision=test_config_params['revision'])
     self.start_test_run_for_bisect(api, update_step, self.bot_db,
-                                   test_config_params, run_locally=True,
-                                   skip_download=skip_download)
+                                   test_config_params, run_locally=True)
 
   def start_test_run_for_bisect(self, api, update_step, bot_db,
-                                test_config_params, run_locally=False,
-                                skip_download=False):
+                                test_config_params, run_locally=False):
     mastername = api.properties.get('mastername')
     buildername = api.properties.get('buildername')
     bot_config = bot_db.get_bot_config(mastername, buildername)
     build_archive_url = test_config_params['parent_build_archive_url']
     if not run_locally:
       api.bisect_tester.upload_job_url()
-    if not skip_download:
-      if api.chromium.c.TARGET_PLATFORM == 'android':
-        # The best way to ensure the old build directory is not used is to
-        # remove it.
-        build_dir = self.m.chromium.c.build_dir.join(
-            self.m.chromium.c.build_config_fs)
-        self.m.file.rmtree('build directory', build_dir)
+    if api.chromium.c.TARGET_PLATFORM == 'android':
+      # The best way to ensure the old build directory is not used is to
+      # remove it.
+      build_dir = self.m.chromium.c.build_dir.join(
+          self.m.chromium.c.build_config_fs)
+      self.m.file.rmtree('build directory', build_dir)
 
-        # The way android builders on tryserver.chromium.perf are archived is
-        # different from builders on chromium.perf. In order to support both
-        # forms of archives, we added this temporary hack until builders are
-        # fixed. See http://crbug.com/535218.
-        zip_dir = self.m.path.join(self.m.path['checkout'], 'full-build-linux')
-        if self.m.path.exists(zip_dir):  # pragma: no cover
-          self.m.file.rmtree('full-build-linux directory', zip_dir)
+      # The way android builders on tryserver.chromium.perf are archived is
+      # different from builders on chromium.perf. In order to support both
+      # forms of archives, we added this temporary hack until builders are
+      # fixed. See http://crbug.com/535218.
+      zip_dir = self.m.path.join(self.m.path['checkout'], 'full-build-linux')
+      if self.m.path.exists(zip_dir):  # pragma: no cover
+        self.m.file.rmtree('full-build-linux directory', zip_dir)
 
-        gs_bucket = 'gs://%s/' % bot_config['bucket']
-        archive_path = build_archive_url[len(gs_bucket):]
-        api.chromium_android.download_build(
-            bucket=bot_config['bucket'],
-            path=archive_path)
+      gs_bucket = 'gs://%s/' % bot_config['bucket']
+      archive_path = build_archive_url[len(gs_bucket):]
+      api.chromium_android.download_build(
+          bucket=bot_config['bucket'],
+          path=archive_path)
 
-        # The way android builders on tryserver.chromium.perf are archived is
-        # different from builders on chromium.perf. In order to support both
-        # forms of archives, we added this temporary hack until builders are
-        # fixed. See http://crbug.com/535218.
-        if self.m.path.exists(zip_dir):  # pragma: no cover
-          self.m.python.inline(
-              'moving full-build-linux to out/Release',
-              """
-              import shutil
-              import sys
-              shutil.move(sys.argv[1], sys.argv[2])
-              """,
-              args=[zip_dir, build_dir])
-      else:
-        api.chromium_tests.download_and_unzip_build(
-            mastername, buildername, update_step, bot_db,
-            build_archive_url=build_archive_url,
-            build_revision=test_config_params['parent_got_revision'],
-            override_bot_type='tester')
+      # The way android builders on tryserver.chromium.perf are archived is
+      # different from builders on chromium.perf. In order to support both
+      # forms of archives, we added this temporary hack until builders are
+      # fixed. See http://crbug.com/535218.
+      if self.m.path.exists(zip_dir):  # pragma: no cover
+        self.m.python.inline(
+            'moving full-build-linux to out/Release',
+            """
+            import shutil
+            import sys
+            shutil.move(sys.argv[1], sys.argv[2])
+            """,
+            args=[zip_dir, build_dir])
+    else:
+      api.chromium_tests.download_and_unzip_build(
+          mastername, buildername, update_step, bot_db,
+          build_archive_url=build_archive_url,
+          build_revision=test_config_params['parent_got_revision'],
+          override_bot_type='tester')
 
     tests = [api.chromium_tests.steps.BisectTest(test_config_params)]
 
     if not tests:  # pragma: no cover
       return
     api.chromium_tests.configure_swarming(  # pragma: no cover
         'chromium', precommit=False, mastername=mastername)
     test_runner = api.chromium_tests.create_test_runner(api, tests)
 
     bot_config_object = api.chromium_tests.create_bot_config_object(
         mastername, buildername)
     with api.chromium_tests.wrap_chromium_tests(bot_config_object, tests):
-      if api.chromium.c.TARGET_PLATFORM == 'android' and not skip_download:
+      if api.chromium.c.TARGET_PLATFORM == 'android':
         if bot_config.get('webview'):
           api.chromium_android.adb_install_apk('SystemWebView.apk')
           api.chromium_android.adb_install_apk('SystemWebViewShell.apk')
         else:
           api.chromium_android.adb_install_apk('ChromePublic.apk')
       test_runner()
 
   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.
 
@@ skipping 35 matching lines @@
           local_bisect.perform_bisect(self)  # pragma: no cover
         else:
           self.start_test_run_for_bisect(api, update_step, self.bot_db,
                                          api.properties)
       else:
         self.m.perf_try.start_perf_try_job(
             affected_files, update_step, self.bot_db)
     finally:
       if api.chromium.c.TARGET_PLATFORM == 'android':
         api.chromium_android.common_tests_final_steps()