Revert of Track step nesting in StreamEngine.

recipe_engine/unittests/run_test.py

 #!/usr/bin/env python
 # 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.
 
 import json
 import os
 import re
 import subprocess
 import sys
 import unittest
 import time
 
 import test_env
 from test_env import BASE_DIR
 
 import recipe_engine.run
-import recipe_engine.simulation_test as simulation_test
 import recipe_engine.step_runner
 from recipe_engine import requests_ssl
 from recipe_engine import recipe_test_api
 import mock
 
 class RunTest(unittest.TestCase):
   def _run_cmd(self, recipe, properties=None):
     script_path = os.path.join(BASE_DIR, 'recipes.py')
 
     if properties:
@@ skipping 110 matching lines @@
     with recipe_engine.stream.NoopStreamEngine() as stream_engine:
       properties = {}
 
       test_data = recipe_engine.recipe_test_api.TestData()
       test_data.expect_exception('SomeException')
 
       api = mock.Mock()
       api._engine = mock.Mock()
       api._engine.properties = properties
 
-      annotator = simulation_test.SimulationAnnotatorStreamEngine()
       engine = recipe_engine.run.RecipeEngine(
           recipe_engine.step_runner.SimulationStepRunner(
-              stream_engine, test_data, annotator),
+              stream_engine, test_data),
           properties,
           None)
 
       class FakeScript(object):
         def run(self, _, __):
           return None
 
       with self.assertRaises(AssertionError):
         engine.run(FakeScript(), api)
 
   def test_subannotations(self):
     proc = subprocess.Popen(
         self._run_cmd('engine_tests/subannotations'),
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE)
     stdout, _ = proc.communicate()
     self.assertRegexpMatches(stdout, r'(?m)^!@@@BUILD_STEP@steppy@@@$')
     self.assertRegexpMatches(stdout, r'(?m)^@@@BUILD_STEP@pippy@@@$')
     # Before 'Subannotate me' we expect an extra STEP_CURSOR to reset the
     # state.
     self.assertRegexpMatches(stdout,
         r'(?m)^@@@STEP_CURSOR@Subannotate me@@@\n@@@STEP_CLOSED@@@$')
 
 
 if __name__ == '__main__':
   unittest.TestCase.maxDiff = None
   unittest.main()