Add json test results format support for SwarmingIsolatedScriptTest

scripts/slave/recipe_modules/chromium_tests/steps.py

 # Copyright 2014 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.
 
 import datetime
 import re
 import string
 
 
 class Test(object):
@@ skipping 1061 matching lines @@
 
     # TODO(nednguyen): only rerun the tests that failed for the "without patch"
     # suffix.
 
     # For the time being, we assume all isolated_script_test are not idempotent
     # TODO(nednguyen): make this configurable in isolated_scripts's spec.
     return api.swarming.isolated_script_task(
         title=self._step_name(suffix), isolated_hash=isolated_hash,
         shards=self._shards, idempotent=False, extra_args=args)
 
+  def validate_simplified_results(self, results):
+    failures = results['failures']
+    valid = results['valid']
+    return results['valid'], results['failures']
+
+  def validate_json_test_results(self, api, results):
+    test_results = api.test_utils.create_results_from_json(results)
+    tests = test_results.tests
+    failures = list(t for t in tests if
+                    tests[t]['expected'] != tests[t]['actual'])
+    valid = results['num_failures_by_type'].get('FAIL', 0) == len(failures)
+    return valid, failures
+
   def validate_task_results(self, api, step_result):
     results = getattr(step_result, 'isolated_script_results', None) or {}
-
+    valid = True
+    failures = []
     try:
-      failures = results['failures']
-      valid = results['valid']
-      if not failures and step_result.retcode != 0:
-        failures = ['%s (entire test suite)' % self.name]
-        valid = False
+      if results.get('version', 0) == 3:
+        valid, failures = self.validate_json_test_results(api, results)
+      else:
+        valid, failures = self.validate_simplified_results(results)
     except (ValueError, KeyError) as e:
       step_result.presentation.logs['invalid_results_exc'] = [str(e)]
       valid = False
       failures = None
+    if not failures and step_result.retcode != 0:
+      failures = ['%s (entire test suite)' % self.name]
+      valid = False
     if valid:
       step_result.presentation.step_text += api.test_utils.format_step_text([
         ['failures:', failures]
       ])
     return valid, failures
 
 
 def generate_isolated_script(api, chromium_tests_api, mastername, buildername,
                              test_spec, bot_update_step, enable_swarming=False,
                              swarming_dimensions=None,
@@ skipping 646 matching lines @@
           args=args)
       api.gsutil.upload(
           temp_output_dir.join(
               '%s-android-chrome.json' % timestamp_string),
           'chromium-annotated-tests', 'android')
 
 GOMA_TESTS = [
   GTestTest('base_unittests'),
   GTestTest('content_unittests'),
 ]