Chromium Code Reviews| Index: scripts/slave/recipes/blink_trybot.py |
| diff --git a/scripts/slave/recipes/blink_trybot.py b/scripts/slave/recipes/blink_trybot.py |
| index 90a89a71621911f09b4cbdfee3b55bee93707f34..e699832332786e72aee4c931b2abc9d12af874e2 100644 |
| --- a/scripts/slave/recipes/blink_trybot.py |
| +++ b/scripts/slave/recipes/blink_trybot.py |
| @@ -254,7 +254,7 @@ BUILDERS = { |
| def GenSteps(api): |
| - class BlinkTest(api.test_utils.Test): |
| + class BlinkTest(api.chromium.steps.Test): |
|
agable
2014/06/28 00:05:13
Can we move this into steps.py with everything els
Paweł Hajdan Jr.
2014/06/28 00:19:01
Done.
|
| name = 'webkit_tests' |
| def __init__(self): |
| @@ -262,13 +262,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']) |
| @@ -328,7 +328,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 |
| @@ -340,7 +340,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 |
| @@ -399,7 +399,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): |