Change SwarmingIsolatedScriptTest to upload json format results

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 json
 import re
 import string
 
 
@@ skipping 1031 matching lines @@
       self.failures(api, suffix)
 
       return self._test_runs[suffix].json.output['valid']
     except Exception:  # pragma: no cover
       return False
 
   def failures(self, api, suffix):
     return self._test_runs[suffix].json.output['failures']
 
 
+def is_json_results_format(results):
+  return results.get('version', 0) == 3
+
+
 class SwarmingIsolatedScriptTest(SwarmingTest):
   def __init__(self, name, args=None, target_name=None, shards=1,
                dimensions=None, tags=None, extra_suffix=None, priority=None,
                expiration=None, hard_timeout=None, upload_test_results=True,
                override_compile_targets=None, perf_id=None,
                results_url=None, perf_dashboard_id=None):
     super(SwarmingIsolatedScriptTest, self).__init__(
         name, dimensions, tags, target_name, extra_suffix, priority, expiration, hard_timeout)
     self._args = args or []
     self._shards = shards
     self._upload_test_results = upload_test_results
     self._override_compile_targets = override_compile_targets
     self._perf_id=perf_id
     self._results_url = results_url
     self._perf_dashboard_id = perf_dashboard_id
+    self._isolated_script_results = {}
 
   @property
   def target_name(self):
     return self._target_name or self._name
 
   def compile_targets(self, _):
     if self._override_compile_targets:
       return self._override_compile_targets
     return [self.target_name]
 
@@ skipping 19 matching lines @@
 
   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 all(res not in tests[t]['expected'].split()
              for res in tests[t]['actual'].split()))
     return True, failures
 
+  def upload_json_format_results(self, api, results):
+    chrome_revision_cp = api.bot_update.last_returned_properties.get(
+        'got_revision_cp', 'x@{#0}')
+    chrome_revision = str(api.commit_position.parse_revision(
+        chrome_revision_cp))
+    api.test_results.upload(
+      api.json.input(results), chrome_revision=chrome_revision,
+      test_type=self.name,
+      test_results_server='test-results.appspot.com')
+
   def validate_task_results(self, api, step_result):
     results = getattr(step_result, 'isolated_script_results', None) or {}
     valid = True
     failures = []
     try:
-      if results.get('version', 0) == 3:
+      if is_json_results_format(results):
         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'] = [repr(e)]
       valid = False
       failures = None
     if not failures and step_result.retcode != 0:
       failures = ['%s (entire test suite)' % self.name]
       valid = False
     if valid:
+      self._isolated_script_results = results
       step_result.presentation.step_text += api.test_utils.format_step_text([
         ['failures:', failures]
       ])
     # Check for chartjson results and upload to results dashboard if present.
     self._output_chartjson_results_if_present(api, step_result)
     return valid, failures
 
+  def post_run(self, api, suffix, test_filter=None):
+    try:
+      super(SwarmingIsolatedScriptTest, self).post_run(
+          api, suffix, test_filter=test_filter)
+    finally:
+      results = self._isolated_script_results
+      if self._upload_test_results and is_json_results_format(results):
+        self.upload_json_format_results(api, results)
+
   def _output_chartjson_results_if_present(self, api, step_result):
     results = \
       getattr(step_result, 'isolated_script_chartjson_results', None) or {}
     try:
       if not results.get('enabled', True):
         step_result.presentation.logs['DISABLED_BENCHMARK'] = \
            ['Info: Benchmark disabled, not sending results to dashboard']
         return
 
       # TODO(eyaich): Remove logging once we debug uploading chartjson
@@ skipping 742 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'),
 ]