Index: scripts/slave/recipes/chromium.py |
diff --git a/scripts/slave/recipes/chromium.py b/scripts/slave/recipes/chromium.py |
index dc683f220d496a3c871326f9137982ef38c89fc5..e0146cdbc4fe5dae7c21035f3a759520ac60d3b6 100644 |
--- a/scripts/slave/recipes/chromium.py |
+++ b/scripts/slave/recipes/chromium.py |
@@ -500,7 +500,41 @@ def GenTests(api): |
api.test_utils.canned_isolated_script_output( |
passing=True, is_win=False, swarming=True, |
shards=2, isolated_script_passing=True, valid=True, |
- output_chartjson=True), |
+ use_json_test_format=True, output_chartjson=True), |
+ retcode=0) |
+ ) |
+ |
+ yield ( |
+ api.test('dynamic_swarmed_sharded_invalid_format_isolated_script_test') + |
+ api.properties.generic(mastername='chromium.linux', |
+ buildername='Linux Tests', |
+ parent_buildername='Linux Builder') + |
+ api.properties(swarm_hashes={ |
+ 'telemetry_gpu_unittests': 'eeeeeeeeeeeeeeeeeeeeeeeeeeeeee', |
+ }) + |
+ api.platform('linux', 64) + |
+ api.override_step_data( |
+ 'read test spec (chromium.linux.json)', |
+ api.json.output({ |
+ 'Linux Tests': { |
+ 'isolated_scripts': [ |
+ { |
+ 'isolate_name': 'telemetry_gpu_unittests', |
+ 'name': 'telemetry_gpu_unittests', |
+ 'swarming': { |
+ 'can_use_on_swarming_builders': True, |
+ 'shards': 3, |
+ }, |
+ }, |
+ ], |
+ }, |
+ }) |
+ ) + |
+ api.override_step_data('telemetry_gpu_unittests on Ubuntu-12.04', |
+ api.test_utils.canned_isolated_script_output( |
+ passing=True, is_win=False, swarming=True, |
+ shards=3, isolated_script_passing=True, valid=False, |
+ use_json_test_format=True, output_chartjson=True), |
retcode=0) |
) |
@@ -533,8 +567,8 @@ def GenTests(api): |
api.override_step_data('telemetry_gpu_unittests on Ubuntu-12.04', |
api.test_utils.canned_isolated_script_output( |
passing=False, is_win=False, swarming=True, |
- shards=2, isolated_script_passing=False, valid=True), |
- retcode=1) |
+ shards=2, isolated_script_passing=False, valid=True, |
+ use_json_test_format=True), retcode=1) |
) |
yield ( |