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 1079 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:
         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:
       step_result.presentation.step_text += api.test_utils.format_step_text([
         ['failures:', failures]
       ])
+      # Only upload json format results.

[Sergiy Byelozyorov, 2016/10/11 14:39:29]

Why is it done in validate_task_results? What if this function is called
multiple times?

[Paweł Hajdan Jr., 2016/10/11 18:04:11]

+1 ; post_run would be better place

[nednguyen, 2016/10/13 17:58:03]

Swarming.post_run(..) calls validate_task_results:
https://cs.chromium.org/chromium/build/scripts/slave/recipe_modules/chromium_...

I override post_run to still call the parent class's post_run, but add some
finally step to upload the result

+      if results.get('version', 0) == 3:
+        self.upload_json_format_results(api, results)
+
     # Check for chartjson results and upload to results dashboard if present.
     self._output_chartjson_results_if_present(api, step_result)
     return valid, failures
 
   def _output_chartjson_results_if_present(self, api, step_result):
     results = \
       getattr(step_result, 'isolated_script_chartjson_results', None) or {}
     try:
       if not 'charts' in results:
         print 'Info: No chart json present'
@@ skipping 685 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'),
 ]