Formally define step config, pass to stream.

recipe_engine/simulation_test.py

 # Copyright 2014 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Provides simulator test coverage for individual recipes."""
 
 import StringIO
 import contextlib
 import json
 import logging
@@ skipping 50 matching lines @@
 class SimulationAnnotatorStreamEngine(stream.AnnotatorStreamEngine):
 
   def __init__(self):
     self._step_buffer_map = {}
     super(SimulationAnnotatorStreamEngine, self).__init__(
         self.step_buffer(None))
 
   def step_buffer(self, step_name):
     return self._step_buffer_map.setdefault(step_name, StringIO.StringIO())
 
-  def _new_step_stream(self, step_name, allow_subannotations, nest_level):
-    return self._create_step_stream(
-        step_name,
-        self.step_buffer(step_name),
-        allow_subannotations,
-        nest_level)
+  def new_step_stream(self, step_config):
+    return self._create_step_stream(step_config,
+                                    self.step_buffer(step_config.name))
 
 
 def RunRecipe(test_data):
   """Actually runs the recipe given the GenTests-supplied test_data."""
   from . import config_types
   from . import loader
   from . import run
   from . import step_runner
   from . import stream
 
@@ skipping 100 matching lines @@
                   'TESTING_SLAVENAME']:
     if env_var in os.environ:
       logging.warn("Ignoring %s environment variable." % env_var)
       os.environ.pop(env_var)
 
   global _UNIVERSE
   _UNIVERSE = universe
 
   expect_tests.main('recipe_simulation_test', GenerateTests,
                     cover_omit=cover_omit(), args=args)