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

Unified Diff: scripts/slave/recipe_modules/filter/example.py

Issue 1474473004: Pass mb_mastername and mb_buildername as parameters to override the default. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Pass mb_mastername and mb_buildername as parameters 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
Index: scripts/slave/recipe_modules/filter/example.py
diff --git a/scripts/slave/recipe_modules/filter/example.py b/scripts/slave/recipe_modules/filter/example.py
index 5d2728daee2083d3d8743af0892fec1e19f57947..28f4eff89c0b5d5404e282493c2553fae1ec988a 100644
--- a/scripts/slave/recipe_modules/filter/example.py
+++ b/scripts/slave/recipe_modules/filter/example.py
@@ -22,6 +22,8 @@ def RunSteps(api):
api.chromium.set_config('chromium')
api.filter.does_patch_require_compile(
affected_files=list(api.m.properties.get('affected_files', ['foo.cc'])),
+ mb_mastername=api.m.properties['mastername'],
+ mb_buildername=api.m.properties['buildername'],
test_targets=test_targets,
additional_compile_targets=additional_compile_targets,
additional_names=['chromium'])
@@ -40,7 +42,9 @@ def GenTests(api):
api.properties(
affected_files=['yy'],
filter_exclusions=[],
- example_changed_paths=['yy']) +
+ example_changed_paths=['yy'],
+ mastername='chromium',
+ buildername='Linux') +
api.override_step_data(
'read filter exclusion spec',
api.json.output({
@@ -49,7 +53,9 @@ def GenTests(api):
# Matches exclusions
yield (api.test('match_exclusion') +
- api.properties(affected_files=['foo.cc']) +
+ api.properties(affected_files=['foo.cc'],
+ mastername='chromium',
+ buildername='Linux') +
api.override_step_data(
'read filter exclusion spec',
api.json.output({
@@ -58,7 +64,9 @@ def GenTests(api):
# Matches exclusions in additional_names key
yield (api.test('match_additional_name_exclusion') +
- api.properties(affected_files=['foo.cc']) +
+ api.properties(affected_files=['foo.cc'],
+ mastername='chromium',
+ buildername='Linux') +
api.override_step_data(
'read filter exclusion spec',
api.json.output({
@@ -69,7 +77,9 @@ def GenTests(api):
yield (api.test('doesnt_match_exclusion') +
api.properties(
affected_files=['bar.cc'],
- example_changed_paths=['bar.cc']) +
+ example_changed_paths=['bar.cc'],
+ mastername='chromium',
+ buildername='Linux') +
api.override_step_data(
'read filter exclusion spec',
api.json.output({
@@ -78,6 +88,8 @@ def GenTests(api):
# Analyze returns matching result.
yield (api.test('analyzes_returns_true') +
+ api.properties(mastername='chromium',
+ buildername='Linux') +
api.override_step_data(
'analyze',
api.json.output({'status': 'Found dependency',
@@ -86,6 +98,8 @@ def GenTests(api):
# Analyze returns matching tests while matching all.
yield (api.test('analyzes_matches_all_exes') +
+ api.properties(mastername='chromium',
+ buildername='Linux') +
api.override_step_data(
'analyze',
api.json.output({'status': 'Found dependency (all)',
@@ -97,7 +111,9 @@ def GenTests(api):
api.properties(
test_targets=['foo', 'bar'],
example_test_targets=['foo', 'bar'],
- example_compile_targets=['bar', 'foo']) +
+ example_compile_targets=['bar', 'foo'],
+ mastername='chromium',
+ buildername='Linux') +
api.override_step_data(
'analyze',
api.json.output({'status': 'Found dependency',
@@ -108,7 +124,9 @@ def GenTests(api):
yield (api.test('analyzes_matches_compile_targets') +
api.properties(
example_test_targets=['foo'],
- example_compile_targets=['bar', 'foo']) +
+ example_compile_targets=['bar', 'foo'],
+ mastername='chromium',
+ buildername='Linux') +
api.override_step_data(
'analyze',
api.json.output({'status': 'Found dependency',
@@ -118,7 +136,9 @@ def GenTests(api):
# Analyze with error condition.
yield (api.test('analyzes_error') +
api.properties(
- test_targets=[]) +
+ test_targets=[],
+ mastername='chromium',
+ buildername='Linux') +
api.override_step_data(
'analyze',
api.json.output({'error': 'ERROR'})))
@@ -126,7 +146,9 @@ def GenTests(api):
# Analyze with python returning bad status.
yield (api.test('bad_retcode_fails') +
api.properties(
- test_targets=[]) +
+ test_targets=[],
+ mastername='chromium',
+ buildername='Linux') +
api.step_data(
'analyze',
retcode=-1))
@@ -135,7 +157,9 @@ def GenTests(api):
yield (api.test('invalid_targets') +
api.properties(
test_targets=[],
- example_result=1) +
+ example_result=1,
+ mastername='chromium',
+ buildername='Linux') +
api.override_step_data(
'analyze',
api.json.output({'invalid_targets': ['invalid', 'another one']})))

Powered by Google App Engine
This is Rietveld 408576698