Refactor stages 1, 2 and test_api overhaul.

scripts/slave/recipe_modules/auto_bisect/old_example.old

 # 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.
 
 import json
 
 DEPS = [
     'auto_bisect',
     'chromium_tests',
+    'depot_tools/gclient',
     'recipe_engine/json',
     'recipe_engine/path',
     'recipe_engine/properties',
     'recipe_engine/raw_io',
     'recipe_engine/step',
 ]
 
 """This file is a recipe demonstrating the auto_bisect recipe module.
 
 For more information about recipes, see: https://goo.gl/xKnjz6
 """
 
 
 def RunSteps(api):
+  mastername = api.properties.get('mastername')
+  buildername = api.properties.get('buildername')
+  bot_config = api.chromium_tests.create_bot_config_object(mastername,
+                                                           buildername)
+  api.chromium_tests.configure_build(bot_config)
+  api.gclient.apply_config('perf')
+  update_step, bot_db = api.chromium_tests.prepare_checkout(bot_config)
+
+  api.auto_bisect.bot_db = bot_db
+
   fake_checkout_path = api.path.mkdtemp('fake_checkout')
   api.path['checkout'] = fake_checkout_path
+  api.path.c.dynamic_paths['catapult'] = api.path['slave_build'].join(
+      'catapult')
   bisector = api.auto_bisect.create_bisector(api.properties['bisect_config'],
                                              do_not_nest_wait_for_revision=True)
 
-  # Request builds and tests for initial range and wait.
   bisector.good_rev.start_job()
+  if bisector.good_rev.failed:
+    return
+
   bisector.bad_rev.start_job()
-  bisector.wait_for_all([bisector.good_rev, bisector.bad_rev])
-
-  if bisector.good_rev.failed or bisector.bad_rev.failed:
+  if bisector.bad_rev.failed:
     return
 
   assert bisector.check_improvement_direction()
   assert bisector.check_initial_confidence()
   revision_to_check = bisector.get_revision_to_eval()
   revision_to_check.start_job()
-  bisector.wait_for(revision_to_check)
   bisector.check_bisect_finished(revision_to_check)
 
   # Evaluate inserted DEPS-modified revisions.
   revision_to_check = bisector.get_revision_to_eval()
   if revision_to_check:
     revision_to_check.start_job()
     # Only added for coverage.
     revision_to_check.read_deps(bisector.get_perf_tester_name())
     api.auto_bisect.query_revision_info(revision_to_check)
   else:
     raise api.step.StepFailure('Expected revision to check.')
   # TODO(robertocn): Add examples for the following operations:
   #  Abort unnecessary jobs
   #  Print results (may be done in a unit test)
 
   # Test runner for classic bisect script; calls bisect script in recipe
   # wrapper with extra_src and path_to_config to override default behavior for
   # android-chrome bisect jobs.
   if api.properties.get('mastername'):
     # TODO(akuegel): Load the config explicitly instead of relying on the
     # builders.py entries in chromium_tests.
     mastername = api.properties.get('mastername')
     buildername = api.properties.get('buildername')
     bot_config = api.chromium_tests.create_bot_config_object(
         mastername, buildername)
     api.chromium_tests.configure_build(bot_config)
+    api.gclient.c.got_revision_mapping.pop('catapult', None)
     api.chromium_tests.prepare_checkout(bot_config)
     kwargs = {
          'extra_src': 'dummy_extra_src',
          'path_to_config': '/dummy/path/',
     }
     api.auto_bisect.run_bisect_script(**kwargs)
 
 
 def GenTests(api):
   dummy_gs_location = ('gs://chrome-perf/bisect-results/'
                        'a6298e4afedbf2cd461755ea6f45b0ad64222222-test.results')
+  bisect_script_test = _make_test(
+      api, _get_basic_test_data(), 'basic_bisect_script')
+
+  bisect_script_test += api.properties(mastername='tryserver.chromium.perf',
+                                       buildername='linux_perf_bisect',
+                                       slavename='dummyslave')
+  yield bisect_script_test
+
   basic_test = _make_test(api, _get_basic_test_data(), 'basic')
   yield basic_test
 
+  yield _make_test(api, _get_reversed_basic_test_data(), 'reversed_basic')
+
   invalid_config_test = api.test('invalid_config')
   invalid_config_test += api.properties(
       bisect_config=_get_config({'good_revision': 'not a valid revision'}))
   yield invalid_config_test
 
+  missing_metric_test = _make_test(
+      api, _get_ref_range_only_missing_metric_test_data(),
+      'missing_metric_test')
+  yield missing_metric_test
+
+  windows_test = _make_test(
+      api, _get_basic_test_data(), 'windows_bisector', platform='windows')
+  yield windows_test
+
+  winx64_test = _make_test(
+      api, _get_basic_test_data(), 'windows_x64_bisector', platform='win_x64')
+  yield winx64_test
+
+  mac_test = _make_test(
+      api, _get_basic_test_data(), 'mac_bisector', platform='mac')
+  yield mac_test
+
+  android_test = _make_test(
+      api, _get_basic_test_data(), 'android_bisector', platform='android')
+  yield android_test
+
+  android_arm64_test = _make_test(
+      api, _get_basic_test_data(), 'android_arm64_bisector',
+      platform='android_arm64')
+  yield android_arm64_test
+
+  failed_data = _get_basic_test_data()
+  failed_data[0].pop('DEPS')
+  failed_data[1]['test_results']['results']['errors'] = ['Dummy error.']
+  failed_data[1].pop('DEPS_change')
+  failed_data[1].pop('DEPS')
+  failed_data[1].pop('DEPS_interval')
+  failed_data[0].pop('git_diff')
+  failed_data[0].pop('cl_info')
+  yield _make_test(api, failed_data, 'failed_test')
+
   failed_build_test = _make_test(
       api, _get_ref_range_only_test_data(), 'failed_build_test',
       extra_config={'dummy_builds': None})
   failed_build_test += api.step_data('gsutil ls', retcode=1)
   failed_build_test += api.step_data('gsutil ls (2)' , retcode=1)
   failed_build_test += api.step_data('gsutil ls (3)' , retcode=1)
   failed_build_test += api.step_data(
       'fetch builder state',
       api.raw_io.output(json.dumps({'cachedBuilds': ['2106']})))
   failed_build_test += api.step_data(
       'fetch build details',
       api.raw_io.output(json.dumps({
           'results': 2,
           'properties': [('build_archive_url',
                           ('gs://chrome-perf/Linux Builder/full-build-linux_'
                            'a6298e4afedbf2cd461755ea6f45b0ad64222222.zip'))]
       })))
   yield failed_build_test
 
-
   delayed_build_test = _make_test(
       api, _get_ref_range_only_test_data(), 'delayed_build_test',
       extra_config={'dummy_builds': None})
   delayed_build_test += api.step_data('gsutil ls', retcode=1)
   delayed_build_test += api.step_data('gsutil ls (2)', retcode=1)
   delayed_build_test += api.step_data('gsutil ls (3)', retcode=1)
   delayed_build_test += api.step_data('gsutil ls (4)', retcode=1)
   delayed_build_test += api.step_data('gsutil ls (5)', retcode=1)
   delayed_build_test += api.step_data('gsutil ls (6)', retcode=1)
   delayed_build_test += api.step_data(
@@ skipping 12 matching lines @@
   delayed_build_test += api.step_data(
       'fetch build details (2)',
       api.raw_io.output(json.dumps({
           'results': 2,
           'properties': [('build_archive_url',
                           ('gs://chrome-perf/Linux Builder/full-build-linux_'
                            'a6298e4afedbf2cd461755ea6f45b0ad64222222.zip'))]
       })))
   yield delayed_build_test
 
-  missing_metric_test = _make_test(
-      api, _get_ref_range_only_missing_metric_test_data(),
-      'missing_metric_test')
-  yield missing_metric_test
-
-  windows_test = _make_test(
-      api, _get_basic_test_data(), 'windows_bisector', platform='windows')
-  yield windows_test
-
-  winx64_test = _make_test(
-      api, _get_basic_test_data(), 'windows_x64_bisector', platform='win_x64')
-  yield winx64_test
-
-  mac_test = _make_test(
-      api, _get_basic_test_data(), 'mac_bisector', platform='mac')
-  yield mac_test
-
-  android_test = _make_test(
-      api, _get_basic_test_data(), 'android_bisector', platform='android')
-  yield android_test
-
-  android_arm64_test = _make_test(
-      api, _get_basic_test_data(), 'android_arm64_bisector',
-      platform='android_arm64')
-  yield android_arm64_test
-
-  failed_data = _get_basic_test_data()
-  failed_data[0].pop('DEPS')
-  failed_data[1]['test_results']['results']['errors'] = ['Dummy error.']
-  failed_data[1].pop('DEPS_change')
-  failed_data[1].pop('DEPS')
-  failed_data[1].pop('DEPS_interval')
-  failed_data[0].pop('git_diff')
-  failed_data[0].pop('cl_info')
-  yield _make_test(api, failed_data, 'failed_test')
-
-  yield _make_test(api, _get_reversed_basic_test_data(), 'reversed_basic')
-
-  bad_git_hash_data = _get_basic_test_data()
-  bad_git_hash_data[1]['interned_hashes'] = {'003': '12345', '002': 'Bad Hash'}
-
-  bisect_script_test = _make_test(
-      api, _get_basic_test_data(), 'basic_bisect_script')
-
-  yield bisect_script_test
-
 
 def _get_ref_range_only_test_data():
   return [
       {
           'refrange': True,
           'hash': 'a6298e4afedbf2cd461755ea6f45b0ad64222222',
           'commit_pos': '314015',
           'fail_to_build': True,
       },
       {
@@ skipping 143 matching lines @@
           'DEPS_interval': {'v8': '002 003 004'.split()},
       },
   ]
 
 
 def _make_test(api, test_data, test_name, platform='linux', extra_config=None):
   basic_test = api.test(test_name)
   basic_test += api.properties(mastername='tryserver.chromium.perf',
                                buildername='linux_perf_bisect',
                                slavename='dummyslave')
+  basic_test += api.auto_bisect()
   basic_test += _get_revision_range_step_data(api, test_data)
   for revision_data in test_data:
     for step_data in _get_step_data_for_revision(api, revision_data):
       basic_test += step_data
   if 'win_x64' in platform:
     basic_test += api.properties(bisect_config=_get_config({
         'command': ('src/tools/perf/run_benchmark -v --browser=release_x64'
                     ' smoothness.tough_scrolling_cases'),
         'recipe_tester_name': 'chromium_rel_win7_x64'}))
   elif 'win' in platform:
@@ skipping 79 matching lines @@
     if revision_data.get('DEPS', False):
       step_name = 'fetch file %s:DEPS' % commit_hash
       yield api.step_data(step_name, stdout=api.raw_io.output(
           revision_data['DEPS']))
 
     if 'git_diff' in revision_data:
       for deps_rev, diff_file in revision_data['git_diff'].iteritems():
         step_name = 'Generating patch for %s:DEPS to %s'
         step_name %= (commit_hash, deps_rev)
         yield api.step_data(step_name, stdout=api.raw_io.output(diff_file))
+        if deps_rev == '003':
+          step_name = ('gsutil Get test results for build %s') % deps_rev
+          yield api.step_data(step_name, stdout=api.json.output(test_results))
 
     if 'DEPS_change' in revision_data:
       step_name = 'Checking DEPS for ' + commit_hash
       yield api.step_data(step_name, stdout=api.raw_io.output('DEPS'))
 
     if 'DEPS_interval' in revision_data:
       for depot_name, interval in revision_data['DEPS_interval'].iteritems():
         for item in reversed(interval[:-1]):
           step_name = 'Hashing modified DEPS file with revision ' + item
           file_hash = 'f412e8458'
           yield api.step_data(step_name, stdout=api.raw_io.output(file_hash))
         step_name = 'Expanding revision range for revision %s on depot %s'
         step_name %= (interval[-1], depot_name)
         stdout = api.json.output([(r, 0) for r in interval[:-1]])
         yield api.step_data(step_name, stdout=stdout)
 
     if 'cl_info' in revision_data:
       step_name = 'Reading culprit cl information.'
       stdout = api.json.output(revision_data['cl_info'])
       yield api.step_data(step_name, stdout=stdout)