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

scripts/slave/unittests/recipes_test.py

 #!/usr/bin/python
 # Copyright (c) 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.
 
 """Provides test coverage for individual recipes.
 
 Recipe tests are located in ../recipes_test/*.py.
 
 Each py file's splitext'd name is expected to match a recipe in ../recipes/*.py.
@@ skipping 46 matching lines @@
 ROOT_PATH = os.path.abspath(os.path.join(SCRIPT_PATH, os.pardir, os.pardir,
                                          os.pardir))
 SLAVE_DIR = os.path.join(ROOT_PATH, 'slave', 'fake_slave', 'build')
 INTERNAL_DIR = os.path.join(ROOT_PATH, os.pardir, 'build_internal')
 BASE_DIRS = {
     'Public': os.path.dirname(SCRIPT_PATH),
     'Internal': os.path.join(INTERNAL_DIR, 'scripts', 'slave'),
 }
 # TODO(iannucci): Check for duplicate recipe names when we have more than one
 # base_dir
+RECIPE_MODULES = [os.path.join(x, 'recipe_modules') for x in BASE_DIRS.values()]
 
 COVERAGE = coverage.coverage(
     include=([os.path.join(x, 'recipes', '*') for x in BASE_DIRS.values()]+
              [os.path.join(SCRIPT_PATH, os.pardir, 'recipe_modules',
                            '*', 'api.py')])
 )
 
 
 @contextlib.contextmanager
 def cover():
   COVERAGE.start()
   try:
     yield
   finally:
     COVERAGE.stop()
 
 with cover():
   from slave import annotated_run
   from slave import recipe_api
 
-class TestAPI(object):
-  @staticmethod
-  def properties_generic(**kwargs):
-    """
-    Merge kwargs into a typical buildbot properties blob, and return the blob.
-    """
-    ret = {
-        'blamelist': 'cool_dev1337@chromium.org,hax@chromium.org',
-        'blamelist_real': ['cool_dev1337@chromium.org', 'hax@chromium.org'],
-        'buildername': 'TestBuilder',
-        'buildnumber': 571,
-        'mastername': 'chromium.testing.master',
-        'slavename': 'TestSlavename',
-        'workdir': '/path/to/workdir/TestSlavename',
-    }
-    ret.update(kwargs)
-    return ret
-
-  @staticmethod
-  def properties_scheduled(**kwargs):
-    """
-    Merge kwargs into a typical buildbot properties blob for a job fired off
-    by a chrome/trunk svn scheduler, and return the blob.
-    """
-    ret = TestAPI.properties_generic(
-        branch='TestBranch',
-        project='',
-        repository='svn://svn-mirror.golo.chromium.org/chrome/trunk',
-        revision='204787',
-    )
-    ret.update(kwargs)
-    return ret
-
-  @staticmethod
-  def properties_tryserver(**kwargs):
-    """
-    Merge kwargs into a typical buildbot properties blob for a job fired off
-    by a rietveld tryjob on the tryserver, and return the blob.
-    """
-    ret = TestAPI.properties_generic(
-        branch='',
-        issue=12853011,
-        patchset=1,
-        project='chrome',
-        repository='',
-        requester='commit-bot@chromium.org',
-        revision='HEAD',
-        rietveld='https://chromiumcodereview.appspot.com',
-        root='src',
-    )
-    ret.update(kwargs)
-    return ret
-
-
 def expected_for(recipe_path, test_name):
   root, name = os.path.split(recipe_path)
   name = os.path.splitext(name)[0]
   expect_path = os.path.join(root, '%s.expected' % name)
   if not os.path.isdir(expect_path):
     os.makedirs(expect_path)
   return os.path.join(expect_path, test_name+'.json')
 
 
 def exec_test_file(recipe_path):
   gvars = {}
   with cover():
     execfile(recipe_path, gvars)
     try:
-      gen = gvars['GenTests'](TestAPI())
+      test_api = recipe_api.CreateTestApi(RECIPE_MODULES, gvars['DEPS'])
+      gen = gvars['GenTests'](test_api)
     except Exception, e:
       print "Caught exception while processing %s: %s" % (recipe_path, e)
       raise
   try:
     while True:
       with cover():
         name, test_data = next(gen)
       yield name, test_data
   except StopIteration:
     pass
@@ skipping 130 matching lines @@
       retcode = retcode or 2
 
   if training:
     test_env.print_coverage_warning()
 
   return retcode
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))