Refactor the way that TestApi works so that it is actually useful.

scripts/slave/recipe_modules/step/api.py

 # Copyright 2013 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.
 
 from slave import recipe_api
+from slave import recipe_util
 
 class StepApi(recipe_api.RecipeApi):
   def __init__(self, *args, **kwargs):
     self._auto_resolve_conflicts = False
     self._name_function = None
     self._step_names = {}
     super(StepApi, self).__init__(*args, **kwargs)
 
   # Making these properties makes them show up in show_me_the_modules,
   # and also makes it clear that they are intended to be mutated.
@@ skipping 14 matching lines @@
       cmd: A list of strings in the style of subprocess.Popen.
       **kwargs: Additional entries to add to the annotator.py step dictionary.
 
     Returns:
       A step dictionary which is compatible with annotator.py.
     """
     assert 'shell' not in kwargs
     assert isinstance(cmd, list)
 
     if kwargs.get('abort_on_failure', False):
-      @recipe_api.wrap_followup(kwargs)
+      @recipe_util.wrap_followup(kwargs)
       def assert_success(step_result):
         if step_result.presentation.status == 'FAILURE':
-          raise recipe_api.RecipeAbort(
+          raise recipe_util.RecipeAbort(
             "Step(%s) failed and was marked as abort_on_failure" % name)
       kwargs['followup_fn'] = assert_success
 
     cmd = list(cmd)  # Create a copy in order to not alter the input argument.
     if self.auto_resolve_conflicts:
       step_count = self._step_names.setdefault(name, 0) + 1
       self._step_names[name] = step_count
       if step_count > 1:
         name = "%s (%d)" % (name, step_count)
     ret = kwargs
     ret.update({'name': name, 'cmd': cmd})
     return ret