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

Unified Diff: recipes.py

Issue 1421843006: Add simple depends_on API. (Closed) Base URL: https://chromium.googlesource.com/external/github.com/luci/recipes-py@master
Patch Set: Remove old expectation, move tests to their own folder. Created 5 years, 1 month 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 | « recipe_engine/unittests/run_test.py ('k') | recipes/engine_tests/depend_on/bad_properties.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: recipes.py
diff --git a/recipes.py b/recipes.py
index d243cc268aad05b7704b69290c48c57a78aac018..3bd12fe96474cf94c61c19c53d96332a88b663e0 100755
--- a/recipes.py
+++ b/recipes.py
@@ -31,12 +31,22 @@ def get_package_config(args):
def simulation_test(package_deps, args):
from recipe_engine import simulation_test
- simulation_test.main(package_deps, args=json.loads(args.args))
+ from recipe_engine import loader
+
+ _, config_file = get_package_config(args)
+ universe = loader.RecipeUniverse(package_deps, config_file.path)
+
+ simulation_test.main(universe, args=json.loads(args.args))
def lint(package_deps, args):
from recipe_engine import lint_test
- lint_test.main(package_deps, args.whitelist or [])
+ from recipe_engine import loader
+
+ _, config_file = get_package_config(args)
+ universe = loader.RecipeUniverse(package_deps, config_file.path)
+
+ lint_test.main(universe, args.whitelist or [])
def handle_recipe_return(recipe_result, result_filename, stream):
@@ -46,9 +56,8 @@ def handle_recipe_return(recipe_result, result_filename, stream):
if result_filename:
with open(result_filename, 'w') as f:
f.write(result_string)
- else:
- with stream.step('recipe result') as s:
- s.write_log_lines('result', [result_string])
+ with stream.step('recipe result') as s:
+ s.write_log_lines('result', [result_string])
if 'reason' in recipe_result.result:
with stream.step('recipe failure reason') as s:
@@ -108,7 +117,8 @@ def run(package_deps, args):
os.environ['PYTHONUNBUFFERED'] = '1'
os.environ['PYTHONIOENCODING'] = 'UTF-8'
- universe = loader.RecipeUniverse(package_deps)
+ _, config_file = get_package_config(args)
+ universe = loader.RecipeUniverse(package_deps, config_file.path)
workdir = (args.workdir or
os.path.join(os.path.dirname(os.path.realpath(__file__)), 'workdir'))
@@ -126,7 +136,7 @@ def run(package_deps, args):
finally:
os.chdir(old_cwd)
- return handle_recipe_return(ret, args.result_file, stream)
+ return handle_recipe_return(ret, args.output_result_json, stream)
def roll(args):
@@ -187,7 +197,12 @@ class ProjectOverrideAction(argparse.Action):
def doc(package_deps, args):
from recipe_engine import doc
- doc.main(package_deps)
+ from recipe_engine import loader
+
+ _, config_file = get_package_config(args)
+ universe = loader.RecipeUniverse(package_deps, config_file)
+
+ doc.main(universe)
def info(args):
@@ -263,7 +278,7 @@ def main():
'--workdir',
help='The working directory of recipe execution')
run_p.add_argument(
- '--result-file',
+ '--output-result-json',
help='The file to write the JSON serialized returned value \
of the recipe to')
run_p.add_argument(
« no previous file with comments | « recipe_engine/unittests/run_test.py ('k') | recipes/engine_tests/depend_on/bad_properties.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698