| Index: scripts/slave/recipes/chromium.py
|
| diff --git a/scripts/slave/recipes/chromium.py b/scripts/slave/recipes/chromium.py
|
| index 3b5d1c22c385e2782d10a67ada000abc83fc84db..b75cc9d90b94a33c7b2f02a45d0b4929eb5e6105 100644
|
| --- a/scripts/slave/recipes/chromium.py
|
| +++ b/scripts/slave/recipes/chromium.py
|
| @@ -337,6 +337,7 @@ def GenTests(api):
|
| )
|
| )
|
|
|
| +
|
| yield (
|
| api.test('dynamic_isolated_script_test_harness_failure_zero_retcode') +
|
| api.properties.generic(mastername='chromium.linux',
|
| @@ -492,7 +493,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)
|
| )
|
|
|
| @@ -525,8 +560,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 (
|
|
|