Add metadata to json results before uploading

scripts/slave/recipe_modules/test_results/resources/upload_test_results.py

 #!/usr/bin/env python
 # Copyright (c) 2015 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.
 
 """See README.md for usage instructions.
 
 This file heavily modified from build/scripts/slave/gtest_slave_utils.py and
 is intended to replace it as all tests move to swarming.
 TODO(estaab): Remove build/scripts/slave/gtest.* once this is fully deployed.
@@ skipping 31 matching lines @@
     for test, results in result_sets.iteritems():
       for result in results:
         result = test_result.TestResult(
             test,
             status=result['status'],
             elapsed_time=result.get('elapsed_time_ms', 0) / 1000.)
         test_results_map.setdefault(test, []).append(result)
   return test_results_map
 
 
-def generate_json_results_file(gtest_json, builder_name, build_number,
-                          results_directory, chrome_revision, master_name):
+def generate_json_results_file_for_json(
+    results_json, builder_name, build_number,
+    results_directory, chrome_revision, master_name):
+  """Generates JSON results file from the given |results_json|.
+
+  Args:
+    results_json: the raw test results object that follows full json results
+      format.
+
+  Returns:
+    A list that contains a single tuple (<file name>, <file path>). The tuple
+    represents the full test results file.
+  """
+  if not os.path.exists(results_directory):
+    os.makedirs(results_directory)
+  json_results_file_path = os.path.abspath(
+      os.path.join(results_directory, FULL_RESULTS_FILENAME))
+  results_json['builder_name'] = builder_name
+  results_json['build_number'] = build_number
+  results_json['chromium_revision'] = chrome_revision
+  results_json['master_name'] = master_name
+  with open(json_results_file_path, 'w') as f:
+    json.dump(results_json, f)
+  return [(FULL_RESULTS_FILENAME, json_results_file_path)]
+
+
+def generate_json_results_file_for_gtest(
+    gtest_json, builder_name, build_number, results_directory, chrome_revision,
+    master_name):
   """Generates JSON results files from the given |gtest_json|.
 
   Args:
     gtest_json: the raw test results object that follows GTest format.
 
   Returns:
     A list of tuples (<file name>, <file path>). The list has two
     elements: the first represent the full test results file, and the
     second is is the times_ms.json file.
   """
@@ skipping 67 matching lines @@
     logging.warn('--test-results-server is given but '
                  '--master-name is not specified; the results won\'t be '
                  'uploaded to the server.')
 
   with file(options.input_json) as json_file:
     results_json = json_file.read()
 
   content = json.loads(results_json)
   if content.get('version', 0) >= 3:
     print 'Input JSON file probably has full json results format'
-    files = [(FULL_RESULTS_FILENAME, os.path.abspath(options.input_json))]
+    files = generate_json_results_file_for_json(
+      content, builder_name=options.builder_name,
+      build_number=options.build_number,
+      results_directory=options.results_directory,
+      chrome_revision=options.chrome_revision,
+      master_name=options.master_name)
   else:
     print ('Input JSON file probably has gtest format. Converting to full json'
            ' results format')
-    files = generate_json_results_file(
+    files = generate_json_results_file_for_gtest(
         results_json, builder_name=options.builder_name,
         build_number=options.build_number,
         results_directory=options.results_directory,
         chrome_revision=options.chrome_revision,
         master_name=options.master_name)
 
   # Upload to a test results server if specified.
   if options.test_results_server and options.master_name:
     print 'Uploading JSON files for builder "%s" to server "%s"' % (
         options.builder_name, options.test_results_server)
     attrs = [('builder', options.builder_name),
              ('testtype', options.test_type),
              ('master', options.master_name)]
 
     # Set uploading timeout in case appengine server is having problem.
     # 120 seconds are more than enough to upload test results.
     test_results_uploader.upload_test_results(
         options.test_results_server, attrs, files, 120)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))