[step] Remove config indirection.

recipe_engine/unittests/stream_logdog_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 collections
 import contextlib
 import datetime
 import json
 import os
@@ skipping 243 matching lines @@
     yield se
 
     # Close the StreamEngine after we're done with it.
     self._advance_time()
     se.close()
 
   @contextlib.contextmanager
   def _step_stream(self, se, **kwargs):
     # Initialize and yield a new step stream.
     self._advance_time()
-    step_stream = se.new_step_stream(recipe_api.StepConfig.create(**kwargs))
+    step_stream = se.new_step_stream(recipe_api.StepClient.StepConfig(**kwargs))
     yield step_stream
 
     # Close the step stream when we're done with it.
     self._advance_time()
     step_stream.close()
 
   @contextlib.contextmanager
   def _log_stream(self, step_stream, name):
     # Initialize and yield a new log stream.
     log_stream = step_stream.new_log_stream(name)
@@ skipping 380 matching lines @@
 
   def testNestedStream(self):
     with self._new_stream_engine() as se:
       # parent
       with self._step_stream(se, name='parent') as step:
         step.write_line('I am the parent.')
 
       # parent."child 1"
       with self._step_stream(se,
           name='child 1',
-          step_nest_level=1) as step:
+          nest_level=1) as step:
         step.write_line('I am child #1.')
 
       # parent."child 1"."grandchild"
       with self._step_stream(se,
           name='grandchild',
-          step_nest_level=2) as step:
+          nest_level=2) as step:
         step.write_line("I am child #1's child.")
 
       # parent."child 2". Mark this child as failed. This should not propagate
       # to the parent, since it has an explicit status.
       with self._step_stream(se,
           name='child 2',
-          step_nest_level=1) as step:
+          nest_level=1) as step:
         step.write_line('I am child #2.')
 
       # parent."child 2". Mark this child as failed. This should not propagate
       # to the parent, since it has an explicit status.
       with self._step_stream(se, name='friend') as step:
         step.write_line("I am the parent's friend.")
 
     self.assertEqual(self.client.all_streams(), {
         u'annotations': {
           u'name': u'steps',
@@ skipping 74 matching lines @@
           step.trigger('trigger spec')
 
   def testTriggersIgnored(self):
     with self._new_stream_engine(ignore_triggers=True) as se:
       with self._step_stream(se, name='trigger') as step:
         step.trigger('trigger spec')
 
   def testNoSubannotations(self):
     with self._new_stream_engine(ignore_triggers=True) as se:
       with self.assertRaises(NotImplementedError):
-        se.new_step_stream(recipe_api.StepConfig.create(
+        se.new_step_stream(recipe_api.StepClient.StepConfig(
             name='uses subannotations',
             allow_subannotations=True,
         ))
 
   def testInvalidStepStatusRaisesValueError(self):
     with self._new_stream_engine() as se:
       with self._step_stream(se, name='trigger') as step:
         with self.assertRaises(ValueError):
           step.set_step_status('OHAI')
 
@@ skipping 172 matching lines @@
 
   def testFirstCheckReturnsData(self):
     # The first check should return data.
     self.assertIsNotNone(self.astate.check())
     # The second will, since nothing has changed.
     self.assertIsNone(self.astate.check())
 
   def testCanCreateAndGetStep(self):
     # Root step.
     base = self.astate.base
-    self.astate.create_step(recipe_api.StepConfig.create(name='first'))
+    self.astate.create_step(recipe_api.StepClient.StepConfig(name='first'))
     self.assertEqual(len(base.substep), 1)
     self.assertEqual(base.substep[0].step.name, 'first')
     self.assertIsNotNone(self.astate.check())
 
     # Child step.
-    self.astate.create_step(recipe_api.StepConfig.create(
+    self.astate.create_step(recipe_api.StepClient.StepConfig(
       name='first child',
-      step_nest_level=1))
+      nest_level=1))
     self.assertEqual(len(base.substep), 1)
     self.assertEqual(len(base.substep[0].step.substep), 1)
     self.assertEqual(base.substep[0].step.substep[0].step.name, 'first child')
     self.assertIsNotNone(self.astate.check())
 
     # Sibling step to 'first'.
-    self.astate.create_step(recipe_api.StepConfig.create(name='second'))
+    self.astate.create_step(recipe_api.StepClient.StepConfig(name='second'))
     self.assertEqual(len(base.substep), 2)
     self.assertEqual(base.substep[1].step.name, 'second')
     self.assertIsNotNone(self.astate.check())
 
   def testCanUpdateProperties(self):
     self.astate.update_properties(foo='baz', qux='quux')
     self.assertEqual(list(self.astate.base.property), [
         pb.Step.Property(name='foo', value='baz'),
         pb.Step.Property(name='qux', value='quux'),
     ])
@@ skipping 29 matching lines @@
     sn = sn.append('#!!! stream name !!!')
     self.assertEqual(str(sn), 'base/s______stream_name____')
 
   def testAugmentInvalidStreamNameNormalizes(self):
     sn = stream_logdog._StreamName('base')
     self.assertEqual(str(sn.augment(' !!! other !!! ')), 'base_____other_____')
 
 
 if __name__ == '__main__':
   unittest.main()