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

Unified Diff: scripts/slave/recipe_modules/chromium_tests/steps.py

Issue 1372723002: Empty per_page_values shouldn't imply test success (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Remove dead code Created 5 years, 3 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 | « no previous file | scripts/slave/recipe_modules/test_utils/test_api.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/chromium_tests/steps.py
diff --git a/scripts/slave/recipe_modules/chromium_tests/steps.py b/scripts/slave/recipe_modules/chromium_tests/steps.py
index 230d988f3942a682da9e05b972da8fbcdcf0cd41..83add78d6b3b3d0a7f3beb9d77037f6dcf0e87b9 100644
--- a/scripts/slave/recipe_modules/chromium_tests/steps.py
+++ b/scripts/slave/recipe_modules/chromium_tests/steps.py
@@ -1245,7 +1245,7 @@ class LocalTelemetryGPUTest(Test): # pylint: disable=W0232
kwargs['args'].extend(['--output-format', 'json',
'--output-dir', api.raw_io.output_dir()])
step_test_data=lambda: api.test_utils.test_api.canned_telemetry_gpu_output(
- passing=False, is_win=api.platform.is_win)
+ passing=True, is_win=api.platform.is_win)
try:
api.isolate.run_telemetry_test(
'telemetry_gpu_test',
@@ -1262,10 +1262,13 @@ class LocalTelemetryGPUTest(Test): # pylint: disable=W0232
try:
res = api.json.loads(step_result.raw_io.output_dir['results.json'])
- self._failures[suffix] = [res['pages'][str(value['page_id'])]['name']
- for value in res['per_page_values']
- if value['type'] == 'failure']
+ failures = [res['pages'][str(value['page_id'])]['name']
+ for value in res['per_page_values']
+ if value['type'] == 'failure']
+ if not failures and step_result.retcode != 0:
+ failures = ['%s (entire test suite)' % self.name]
+ self._failures[suffix] = failures
self._valid[suffix] = True
except (ValueError, KeyError, AttributeError): # pragma: no cover
self._valid[suffix] = False
@@ -1321,6 +1324,8 @@ class SwarmingTelemetryGPUTest(SwarmingTest):
failures = [results['pages'][str(value['page_id'])]['name']
for value in results['per_page_values']
if value['type'] == 'failure']
+ if not failures and step_result.retcode != 0:
+ failures = ['%s (entire test suite)' % self.name]
valid = True
except (ValueError, KeyError) as e: # pragma: no cover
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/test_utils/test_api.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698