Revert of Avoid nesting steps called under waiting for x:

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',
     'recipe_engine/json',
@@ skipping 69 matching lines @@
 
   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
 
   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',
+      'Waiting for chromium@a6298e4afe.gsutil ls' , retcode=1)
+  failed_build_test += api.step_data(
+      'Waiting for chromium@a6298e4afe.fetch builder state',
       api.raw_io.output(json.dumps({'cachedBuilds': ['2106']})))
   failed_build_test += api.step_data(
-      'fetch build details',
+      'Waiting for chromium@a6298e4afe.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(
-      'fetch builder state',
+      'Waiting for chromium@a6298e4afe.gsutil ls', retcode=1)
+  delayed_build_test += api.step_data(
+      'Waiting for chromium@a6298e4afe.gsutil ls (2)', retcode=1)
+  delayed_build_test += api.step_data(
+      'Waiting for chromium@a6298e4afe.gsutil ls (3)', retcode=1)
+  delayed_build_test += api.step_data(
+      'Waiting for chromium@a6298e4afe.fetch builder state',
       api.raw_io.output(json.dumps({'cachedBuilds': []})))
   delayed_build_test += api.step_data(
-      'fetch builder state (2)',
+      'Waiting for chromium@a6298e4afe.fetch builder state (2)',
       api.raw_io.output(json.dumps({'cachedBuilds': ['2106']})))
   delayed_build_test += api.step_data(
-      'fetch build details',
+      'Waiting for chromium@a6298e4afe.fetch build details',
       api.raw_io.output(json.dumps({
           'properties': [('build_archive_url',
                           ('gs://chrome-perf/Linux Builder/full-build-linux_'
                            'a6298e4afedbf2cd461755ea6f45b0ad64222222.zip'))]
       })))
   delayed_build_test += api.step_data(
-      'fetch build details (2)',
+      'Waiting for chromium@a6298e4afe.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(),
@@ skipping 282 matching lines @@
   if 'refrange' in revision_data:
     parent_step = 'Resolving reference range.'
     commit_pos = 'refs/heads/master@{#%s}' % commit_pos_number
     step_name = parent_step + 'crrev get commit hash for ' + commit_pos
     yield api.step_data(
         step_name,
         stdout=api.json.output({'git_sha': commit_hash}))
 
   if include_build_steps:
     if test_results:
-      step_name = ('gsutil Get test results for build %s') % commit_hash
+      step_name = ('Waiting for chromium@%s.gsutil '
+                   'Get test results for build %s') % (commit_hash[:10],
+                                                       commit_hash)
       yield api.step_data(step_name, stdout=api.json.output(test_results))
 
     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'
@@ skipping 12 matching lines @@
           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)