Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(343)

Unified Diff: scripts/slave/unittests/recipe_simulation_test.py

Issue 1151423002: Move recipe engine to third_party/recipe_engine. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Moved field_composer_test with its buddies Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/unittests/recipe_lint_test.py ('k') | scripts/tools/runit.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/unittests/recipe_simulation_test.py
diff --git a/scripts/slave/unittests/recipe_simulation_test.py b/scripts/slave/unittests/recipe_simulation_test.py
index f3f6428f8ba2657cd6eeb9787f4df20d694f31ed..abb4bedc7d6155dabb78b9c40e0e7b1f2577e815 100755
--- a/scripts/slave/unittests/recipe_simulation_test.py
+++ b/scripts/slave/unittests/recipe_simulation_test.py
@@ -1,98 +1,15 @@
#!/usr/bin/env python
-# Copyright 2014 The Chromium Authors. All rights reserved.
+# 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 simulator test coverage for individual recipes."""
-
-import logging
import os
+import sys
-# Importing for side effects on sys.path? Yes... yes we are :(
-import test_env # pylint: disable=W0611,W0403
-
-from slave import recipe_util
-
-import expect_tests # pylint: disable=W0403
-
-
-_UNIVERSE = None
-def get_universe():
- from slave import recipe_loader
- global _UNIVERSE
- if _UNIVERSE is None:
- _UNIVERSE = recipe_loader.RecipeUniverse()
- return _UNIVERSE
-
-
-def RunRecipe(test_data):
- from common import annotator
- from slave import annotated_run
- from slave import recipe_config_types
-
- stream = annotator.StructuredAnnotationStream(stream=open(os.devnull, 'w'))
- recipe_config_types.ResetTostringFns()
- # TODO(iannucci): Only pass test_data once.
- result = annotated_run.run_steps(stream, test_data.properties,
- test_data.properties,
- get_universe(),
- test_data)
-
- return expect_tests.Result(list(result.steps_ran.values()))
-
-
-def test_gen_coverage():
- return (
- [os.path.join(x, '*') for x in recipe_util.RECIPE_DIRS()] +
- [os.path.join(x, '*', 'example.py') for x in recipe_util.MODULE_DIRS()] +
- [os.path.join(x, '*', 'test_api.py') for x in recipe_util.MODULE_DIRS()] +
- [os.path.join(os.path.dirname(recipe_util.__file__), 'recipe_api.py')]
- )
-
-
-@expect_tests.covers(test_gen_coverage)
-def GenerateTests():
- from slave import recipe_loader
-
- universe = get_universe()
-
- cover_mods = [
- os.path.join(os.path.dirname(recipe_util.__file__), 'recipe_api.py')
- ]
- for mod_dir_base in recipe_util.MODULE_DIRS():
- if os.path.isdir(mod_dir_base):
- cover_mods.append(os.path.join(mod_dir_base, '*', '*.py'))
-
- for recipe_path, recipe_name in recipe_loader.loop_over_recipes():
- recipe = universe.load_recipe(recipe_name)
- test_api = recipe_loader.create_test_api(recipe.LOADED_DEPS, universe)
-
- covers = cover_mods + [recipe_path]
-
- for test_data in recipe.GenTests(test_api):
- root, name = os.path.split(recipe_path)
- name = os.path.splitext(name)[0]
- expect_path = os.path.join(root, '%s.expected' % name)
-
- test_data.properties['recipe'] = recipe_name.replace('\\', '/')
- 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.GenSteps,)
- )
+import test_env # pylint: disable=W0403,W0611
+from recipe_engine import simulation_test
+from slave import recipe_universe
if __name__ == '__main__':
- # annotated_run.py 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)
-
- expect_tests.main('recipe_simulation_test', GenerateTests)
+ simulation_test.main(recipe_universe.get_universe())
« no previous file with comments | « scripts/slave/unittests/recipe_lint_test.py ('k') | scripts/tools/runit.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698