Add json test results format support for SwarmingIsolatedScriptTest

scripts/slave/recipes/chromium.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 DEPS = [
   'adb',
   'bisect_tester',
   'depot_tools/bot_update',
   'chromium',
   'chromium_android',
@@ skipping 319 matching lines @@
                             '--test-machine-name=\"${buildername}\"',
                             '--build-revision=\"${got_revision}\"',
                         ],
                     },
                 ],
             },
         })
     )
   )
 
+

[Sergiy Byelozyorov, 2016/10/05 15:36:06]

nit: please remove this line... no need for double-empty-line between tests

[nednguyen, 2016/10/05 18:50:53]

Done.

   yield (
     api.test('dynamic_isolated_script_test_harness_failure_zero_retcode') +
     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(
@@ skipping 143 matching lines @@
                         },
                     },
                 ],
             },
         })
     ) +
     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=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)
+  )
+
   yield (
     api.test('dynamic_swarmed_sharded_failed_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': 2,
                         },
                     },
                 ],
             },
         })
     ) +
     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 (
     api.test('dynamic_swarmed_sharded_isolated_script_test_missing_shard') +
     api.properties.generic(mastername='chromium.linux',
                            buildername='Linux Tests',
                            parent_buildername='Linux Builder') +
     api.properties(swarm_hashes={
       'telemetry_gpu_unittests': 'eeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
     }) +
@@ skipping 934 matching lines @@
   yield (
     api.test('ensure_goma_fail') +
     api.properties(
         mastername='chromium.fyi',
         buildername='Linux remote_run Builder',
         slavename='build1-a1',
         buildnumber='77457',
         path_config='kitchen') +
     api.override_step_data('ensure_goma.ensure_installed', retcode=1)
   )