Recipe package system.

recipe_engine/simulation_test.py

 # Copyright 2014-2015 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 simulator test coverage for individual recipes."""
 
 import logging
 import re
 import os
 import sys
 
-from . import expect_tests
+from .third_party import expect_tests
 
 # This variable must be set in the dynamic scope of the functions in this file.
 # We do this instead of passing because the threading system of expect tests
 # doesn't know how to serialize it.
 _UNIVERSE = None
 
 def RunRecipe(test_data):
   from .third_party import annotator
-  from . import main
+  from . import run
   from . import config_types
 
   stream = annotator.StructuredAnnotationStream(stream=open(os.devnull, 'w'))
   config_types.ResetTostringFns()
-  result = main.run_steps(
+  result = run.run_steps(
       test_data.properties, stream, _UNIVERSE, test_data)
 
   return expect_tests.Result(list(result.steps_ran.values()))
 
 
 def test_gen_coverage():
   return (
       [os.path.join(x, '*') for x in _UNIVERSE.recipe_dirs] +
       [os.path.join(x, '*', 'example.py') for x in _UNIVERSE.module_dirs] +
       [os.path.join(x, '*', 'test_api.py') for x in _UNIVERSE.module_dirs]
@@ skipping 30 matching lines @@
       yield expect_tests.Test(
           '%s.%s' % (recipe_name, test_data.name),
           expect_tests.FuncCall(RunRecipe, test_data),
           expect_dir=expect_path,
           expect_base=test_data.name,
           covers=covers,
           break_funcs=(recipe.RunSteps,)
       )
 
 
-def main(universe):
+def main(package_deps, args=None):
   """Runs simulation tests on a given repo of recipes.
 
   Args:
-    universe: a RecipeUniverse to operate on.
+    package_deps: a PackageDeps object to operate on
+    args: command line arguments to expect_tests
   Returns:
     Doesn't -- exits with a status code
   """
+  from . import loader
+  from . import package
 
   # annotated_run has different behavior when these environment variables
   # are set, so unset to make simulation tests environment-invariant.
   for env_var in ['TESTING_MASTER_HOST',
                   'TESTING_MASTER',
                   'TESTING_SLAVENAME']:
     if env_var in os.environ:
       logging.warn("Ignoring %s environment variable." % env_var)
       os.environ.pop(env_var)
 
   global _UNIVERSE
-  _UNIVERSE = universe
+  _UNIVERSE = loader.RecipeUniverse(package_deps)
+
   expect_tests.main('recipe_simulation_test', GenerateTests,
-                    cover_omit=cover_omit())
+                    cover_omit=cover_omit(), args=args)