Formally define step config, pass to stream.

recipe_engine/unittests/stream_test.py

 #!/usr/bin/env python
 # Copyright 2015 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 cStringIO
 import os
 import sys
 import unittest
 
 import test_env
 
+from recipe_engine import recipe_api
 from recipe_engine import stream
 
 class StreamTest(unittest.TestCase):
   def _example(self, engine):
-    foo = engine.new_step_stream('foo')
+    foo = engine.make_step_stream('foo')
     foo.write_line('foo says hello to xyrself')
 
-    bar = engine.new_step_stream('bar')
+    bar = engine.make_step_stream('bar')
     foo.write_split('foo says hello to bar:\n  hi bar')
     bar.write_line('bar says hi, shyly')
 
     foo.write_line('foo begins to read a poem')
     with foo.new_log_stream('poem/proposition') as poem:
       poem.write_line('bar, thoust art soest beautiful')
       bar.add_step_text('*blushing*')
       poem.write_line('thoust makest mine heartst goest thumpitypump..est')
 
     foo.add_step_link('read it online!', 'https://foospoemtobar.com/')
     foo.add_step_summary_text('read a killer poem and took a bow')
     foo.trigger('{"builderName":["bar\'s fantasies"]}')
     foo.close()
 
     # TODO(luqui): N.B. stream interleaving is not really possible with
     # subannotations, since the subannotator stream could have changed the
     # active step.  To do this right we would need to parse and re-emit
     # subannotations.
-    bars_baby = engine.new_step_stream(
+    bars_baby = engine.make_step_stream(
         'bar\'s baby',
         allow_subannotations=True,
-        nest_level=1)
+        step_nest_level=1)
     bars_baby.write_line('I\'m in bar\'s imagination!!')
     bars_baby.write_line('@@@STEP_WARNINGS@@@')
     bars_baby.reset_subannotation_state()
     bars_baby.close()
 
     bar.set_build_property('is_babycrazy', 'true')
     bar.write_line('bar tries to kiss foo, but foo already left')
     bar.write_line('@@@KISS@foo@@@')
     bar.set_step_status('EXCEPTION')
     bar.close()
@@ skipping 73 matching lines @@
     with engine:
       self._example(engine)
     self.assertEqual(stringio.getvalue(), self._example_annotations())
 
   def test_noop(self):
     with stream.NoopStreamEngine() as engine:
       self._example(engine)
 
   def test_write_after_close(self):
     with stream.StreamEngineInvariants() as engine:
-      foo = engine.new_step_stream('foo')
+      foo = engine.make_step_stream('foo')
       foo.close()
       with self.assertRaises(AssertionError):
         foo.write_line('no')
 
   def test_log_still_open(self):
     with stream.StreamEngineInvariants() as engine:
-      foo = engine.new_step_stream('foo')
+      foo = engine.make_step_stream('foo')
       log = foo.new_log_stream('log')
       with self.assertRaises(AssertionError):
         foo.close()
 
   def test_no_write_multiple_lines(self):
     with stream.StreamEngineInvariants() as engine:
-      foo = engine.new_step_stream('foo')
+      foo = engine.make_step_stream('foo')
       with self.assertRaises(AssertionError):
         foo.write_line('one thing\nand another!')
 
   def test_invalid_status(self):
     with stream.StreamEngineInvariants() as engine:
-      foo = engine.new_step_stream('foo')
+      foo = engine.make_step_stream('foo')
       with self.assertRaises(AssertionError):
         foo.set_step_status('SINGLE')
 
   def test_buildbot_status_constraint(self):
     with stream.StreamEngineInvariants() as engine:
-      foo = engine.new_step_stream('foo')
+      foo = engine.make_step_stream('foo')
       foo.set_step_status('FAILURE')
       with self.assertRaises(AssertionError):
         foo.set_step_status('SUCCESS')
 
 if __name__ == '__main__':
   unittest.main()