Refactoring scripts that wait for buildbot jobs to complete.

scripts/slave/recipe_modules/auto_bisect/example.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.
 
 import json
 
 DEPS = [
     'auto_bisect',
     'chromium_tests',
+    'json',
     'path',
     'properties',
     'raw_io',
     'step',
 ]
 
 
 # This file is just a recipe showing how one would use this module.
 #
 # The RunSteps and GenTests functions define the required interface for a
@@ skipping 11 matching lines @@
 def RunSteps(api):
   fake_checkout_path = api.path.mkdtemp('fake_checkout')
   api.path['checkout'] = fake_checkout_path
   bisector = api.auto_bisect.create_bisector(api.properties['bisect_config'])
 
   # Request builds/tests for initial range and wait
   bisector.good_rev.start_job()
   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:
+    return
+
   assert bisector.check_improvement_direction()
   assert bisector.check_initial_confidence()
   revisions_to_check = bisector.get_revisions_to_eval(1)
   assert len(revisions_to_check) == 1
   revisions_to_check[0].start_job()
   bisector.wait_for_any(revisions_to_check)
   bisector.check_bisect_finished(revisions_to_check[0])
 
   # Evaluate inserted DEPS-modified revisions
   revisions_to_check = bisector.get_revisions_to_eval(2)
@@ skipping 12 matching lines @@
   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')
     api.chromium_tests.configure_build(mastername, buildername)
     api.chromium_tests.prepare_checkout(mastername, buildername)
     api.auto_bisect.run_bisect_script('dummy_extra_src', '/dummy/path/')
 
 def GenTests(api):
-  wait_for_any_output = (
-      'Build finished: gs://chrome-perf/bisect-results/'
-      'a6298e4afedbf2cd461755ea6f45b0ad64222222-test.results')
+  dummy_gs_location = ('gs://chrome-perf/bisect-results/'
+                       'a6298e4afedbf2cd461755ea6f45b0ad64222222-test.results')
+  wait_for_any_output = {
+      'completed': [
+          {
+              'type': 'gs',
+              'location': dummy_gs_location
+          }
+      ]
+  }
+
   basic_data = _get_basic_test_data()
   basic_test = _make_test(api, basic_data, 'basic')
   basic_test += api.step_data(
       'Waiting for revision 314015 and 1 other revision(s). (2)',
-      stdout=api.raw_io.output(wait_for_any_output))
+      stdout=api.json.output(wait_for_any_output))
 
   yield basic_test
 
+  failed_build_test_data = _get_ref_range_only_test_data()
+  failed_build_test = _make_test(
+      api, failed_build_test_data, 'failed_build_test')
+  failed_build_test_step_data = {'failed': [
+      {'builder': 'linux_perf_tester',
+       'job_name': 'a6298e4afedbf2cd461755ea6f45b0ad64222222-test',
+       'master': 'tryserver.chromium.perf',
+       'type': 'buildbot'}
+  ]}
+  failed_build_test += api.step_data(
+      'Waiting for revision 314015 and 1 other revision(s). (2)',
+      stdout=api.json.output(failed_build_test_step_data))
+
+  yield failed_build_test
+
   basic_data = _get_basic_test_data()
   windows_test = _make_test(
       api, basic_data, 'windows_bisector', platform='windows')
   windows_test += api.step_data(
       'Waiting for revision 314015 and 1 other revision(s). (2)',
-      stdout=api.raw_io.output(wait_for_any_output))
+      stdout=api.json.output(wait_for_any_output))
 
   yield windows_test
 
   basic_data = _get_basic_test_data()
   winx64_test = _make_test(
       api, basic_data, 'windows_x64_bisector', platform='win_x64')
   winx64_test += api.step_data(
       'Waiting for revision 314015 and 1 other revision(s). (2)',
-      stdout=api.raw_io.output(wait_for_any_output))
+      stdout=api.json.output(wait_for_any_output))
 
   yield winx64_test
 
   basic_data = _get_basic_test_data()
   mac_test = _make_test(api, basic_data, 'mac_bisector', platform='mac')
   mac_test += api.step_data(
       'Waiting for revision 314015 and 1 other revision(s). (2)',
-      stdout=api.raw_io.output(wait_for_any_output))
+      stdout=api.json.output(wait_for_any_output))
 
   yield mac_test
 
   basic_data = _get_basic_test_data()
   android_test = _make_test(
       api, basic_data, 'android_bisector', platform='android')
   android_test += api.step_data(
       'Waiting for revision 314015 and 1 other revision(s). (2)',
-      stdout=api.raw_io.output(wait_for_any_output))
+      stdout=api.json.output(wait_for_any_output))
 
   yield android_test
 
   basic_data = _get_basic_test_data()
   android_arm64_test = _make_test(
       api, basic_data, 'android_arm64_bisector', platform='android_arm64')
   android_arm64_test += api.step_data(
       'Waiting for revision 314015 and 1 other revision(s). (2)',
-      stdout=api.raw_io.output(wait_for_any_output))
+      stdout=api.json.output(wait_for_any_output))
 
   yield android_arm64_test
 
   failed_data = _get_basic_test_data()
   failed_data[0].pop('DEPS')
   failed_data[1]['test_results']['results']['error'] = 'Dummy error.'
   failed_data[1]['test_results']['results'].pop('mean')
   failed_data[1]['test_results']['results'].pop('std_err')
   failed_data[1].pop('DEPS_change')
   failed_data[1].pop('DEPS')
@@ skipping 24 matching lines @@
 
   bad_deps_syntax_data = _get_basic_test_data()
   bad_deps_syntax_data[1]['DEPS']='raise RuntimeError("")'
   yield _make_test(api, bad_deps_syntax_data, 'bad_deps_syntax')
 
 
   basic__data = _get_basic_test_data()
   bisect_script_test = _make_test(api, basic_data, 'basic_bisect_script')
   bisect_script_test += api.step_data(
       'Waiting for revision 314015 and 1 other revision(s). (2)',
-      stdout=api.raw_io.output(wait_for_any_output))
+      stdout=api.json.output(wait_for_any_output))
 
   bisect_script_test += api.properties(mastername='tryserver.chromium.perf',
                                        buildername='linux_perf_bisect',
                                        slavename='dummyslave')
   yield bisect_script_test
 
 
+def _get_ref_range_only_test_data():
+  return [
+      {
+          'refrange': True,
+          'hash': 'a6298e4afedbf2cd461755ea6f45b0ad64222222',
+          'commit_pos': '314015',
+      },
+      {
+          'refrange': True,
+          'hash': '00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111',
+          'commit_pos': '314017',
+          'test_results': {
+              'results':{
+                  'mean': 15,
+                  'std_err': 1,
+                  'values': [14, 15, 16],
+              },
+              'retcodes': [0],
+          }
+      },
+  ]
+
+
 def _get_basic_test_data():
   return [
       {
           'refrange': True,
           'hash': 'a6298e4afedbf2cd461755ea6f45b0ad64222222',
           'commit_pos': '314015',
           'test_results': {
               'results':{
                   'mean': 20,
                   'std_err': 1,
@@ skipping 172 matching lines @@
       'recipe_tester_name': 'linux_perf_tester'
   }
   example_config.update(params)
   return example_config
 
 
 def _get_step_data_for_revision(api, revision_data, include_build_steps=True):
   """Generator that produces step patches for fake results."""
   commit_pos = revision_data['commit_pos']
   commit_hash = revision_data['hash']
-  test_results = revision_data['test_results']
+  test_results = revision_data.get('test_results')
 
   if 'refrange' in revision_data:
     parent_step = 'Resolving reference range.'
   else:
     parent_step = 'Expanding revision range.'
   step_name = parent_step + 'resolving commit_pos ' + commit_pos
   yield api.step_data(step_name, stdout=api.raw_io.output('hash:' +
                                                           commit_hash))
 
   step_name = parent_step + 'resolving hash ' + commit_hash
   commit_pos_str = 'refs/heads/master@{#%s}' % commit_pos
   yield api.step_data(step_name, stdout=api.raw_io.output(commit_pos_str))
 
   if include_build_steps:
-    step_name = 'gsutil Get test results for build ' + commit_hash
-    yield api.step_data(step_name, stdout=api.raw_io.output(json.dumps(
-        test_results)))
+    if test_results:
+      step_name = 'gsutil Get test results for build ' + commit_hash
+      yield api.step_data(step_name, stdout=api.json.output(test_results))
 
     if revision_data.get('DEPS', False):
       step_name = 'git cat-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)
@@ skipping 14 matching lines @@
         step_name = 'Expanding revision range for revision %s on depot %s'
         step_name %= (interval[0], depot_name)
         stdout = api.raw_io.output('\n'.join(interval))
         yield api.step_data(step_name, stdout=stdout)
 
     if 'cl_info' in revision_data:
       step_name = 'Reading culprit cl information.'
       stdout = api.raw_io.output(revision_data['cl_info'])
       yield api.step_data(step_name, stdout=stdout)