Revert of Reland of 'Make allow_subannotations more robust'

scripts/slave/unittests/recipe_simulation_test.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Provides simulator test coverage for individual recipes."""
 
 import logging
 import os
 
 # Importing for side effects on sys.path? Yes... yes we are :(
 import test_env  # pylint: disable=W0611,W0403
 
 from common import annotator
 from slave import annotated_run
 from slave import recipe_config_types
 from slave import recipe_loader
 from slave import recipe_util
 
 import expect_tests  # pylint: disable=W0403
 
 
 def RunRecipe(test_data):
   stream = annotator.StructuredAnnotationStream(stream=open(os.devnull, 'w'))
   recipe_config_types.ResetTostringFns()
   # TODO(iannucci): Only pass test_data once.
   result = annotated_run.run_steps(stream, test_data.properties,
                                    test_data.properties, test_data)
 
-  return expect_tests.Result(list(s.step for s in result.steps_ran.values()))
+  return expect_tests.Result(list(result.steps_ran.values()))
 
 
 def test_gen_coverage():
   return (
       [os.path.join(x, '*') for x in recipe_util.RECIPE_DIRS()] +
       [os.path.join(x, '*', 'example.py') for x in recipe_util.MODULE_DIRS()] +
       [os.path.join(x, '*', 'test_api.py') for x in recipe_util.MODULE_DIRS()]
   )
 
 @expect_tests.covers(test_gen_coverage)
@@ skipping 29 matching lines @@
   # annotated_run.py has different behavior when these environment variables
   # are set, so unset to make simulation tests environment-invariant.
   for env_var in ['TESTING_MASTER_HOST',
                   'TESTING_MASTER',
                   'TESTING_SLAVENAME']:
     if env_var in os.environ:
       logging.warn("Ignoring %s environment variable." % env_var)
       os.environ.pop(env_var)
 
   expect_tests.main('recipe_simulation_test', GenerateTests)