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

Unified Diff: scripts/slave/recipes/blink_trybot.py

Issue 339183013: De-duplicate steps between chromium and chromium_trybot recipes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 6 years, 6 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
Index: scripts/slave/recipes/blink_trybot.py
diff --git a/scripts/slave/recipes/blink_trybot.py b/scripts/slave/recipes/blink_trybot.py
index 66d4bdda829f70dd65762be1af5f39e1accdba3b..099a69a5144d8f566aac10cfb77160bcfe178e7d 100644
--- a/scripts/slave/recipes/blink_trybot.py
+++ b/scripts/slave/recipes/blink_trybot.py
@@ -244,7 +244,7 @@ BUILDERS = {
def GenSteps(api):
- class BlinkTest(api.test_utils.Test):
+ class BlinkTest(api.chromium.steps.Test):
name = 'webkit_tests'
def __init__(self):
@@ -252,13 +252,13 @@ def GenSteps(api):
self.layout_test_wrapper = api.path['build'].join(
'scripts', 'slave', 'chromium', 'layout_test_wrapper.py')
- def run(self, suffix):
+ def run(self, api, suffix):
args = ['--target', api.chromium.c.BUILD_CONFIG,
'-o', self.results_dir,
'--build-dir', api.chromium.c.build_dir,
'--json-test-results', api.json.test_results(add_json_log=False)]
if suffix == 'without patch':
- test_list = "\n".join(self.failures('with patch'))
+ test_list = "\n".join(self.failures(api, 'with patch'))
args.extend(['--test-list', api.raw_io.input(test_list),
'--skipped', 'always'])
@@ -318,7 +318,7 @@ def GenSteps(api):
followup_fn=archive_webkit_tests_results_followup
)
- def has_valid_results(self, suffix):
+ def has_valid_results(self, api, suffix):
step = api.step_history[self._step_name(suffix)]
# TODO(dpranke): crbug.com/357866 - note that all comparing against
# MAX_FAILURES_EXIT_STATUS tells us is that we did not exit early
@@ -330,7 +330,7 @@ def GenSteps(api):
return (step.json.test_results.valid and
step.retcode <= step.json.test_results.MAX_FAILURES_EXIT_STATUS)
- def failures(self, suffix):
+ def failures(self, api, suffix):
sn = self._step_name(suffix)
return api.step_history[sn].json.test_results.unexpected_failures
@@ -426,7 +426,8 @@ def GenSteps(api):
api.chromium.compile(always_run=True),
)
- yield api.test_utils.determine_new_failures([BlinkTest()], deapply_patch_fn)
+ yield api.test_utils.determine_new_failures(
+ api, [BlinkTest()], deapply_patch_fn)
def _sanitize_nonalpha(text):

Powered by Google App Engine
This is Rietveld 408576698