Revert of [recipe_modules/test_results] Refactor the logic of generating full json results files

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(results_json, builder_name, build_number,
+def generate_json_results(test_results_map, builder_name, build_number,
                           results_directory, chrome_revision, master_name):
-  """Generates JSON results files from the given |results_json|.
+  """Generates JSON results files from the given test_results_map.
 
   Args:
-    results_json: the raw test results object that follows GTest format.
+    test_results_map: A map of TestResult.
   """
-  results_map = get_results_map_from_json(results_json)
   if not os.path.exists(results_directory):
     os.makedirs(results_directory)
 
   print('Generating json: '
         'builder_name:%s, build_number:%s, '
         'results_directory:%s, '
         'chrome_revision:%s '
         'master_name:%s' %
         (builder_name, build_number,
          results_directory,
          chrome_revision,
          master_name))
 
   # TODO(estaab): This doesn't need to be an object. Make it a simple function.
   generator = JSONResultsGenerator(
       builder_name, build_number,
       results_directory,
       test_results_map,
       svn_revisions=[('chromium', chrome_revision)],
       master_name=master_name)
   generator.generate_json_output()
   generator.generate_times_ms_file()
-  return [(f, os.path.join(results_directory, f)) for f in
-          (FULL_RESULTS_FILENAME, TIMES_MS_FILENAME)]
 
 
 def main():
   option_parser = optparse.OptionParser()
   option_parser.add_option('--test-type',
                            help='Test type that generated the results json,'
                                 ' e.g. unit-tests.')
   option_parser.add_option('--results-directory', default=os.getcwd(),
                            help='Output results directory source dir.')
   option_parser.add_option('--input-json',
@@ skipping 27 matching lines @@
   if not options.input_json:
     option_parser.error('--input-json needs to be specified.')
     return 1
 
   if options.test_results_server and not options.master_name:
     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()
+    results_map = get_results_map_from_json(json_file.read())
 
-  files = generate_json_results_file(
-      results_json, builder_name=options.builder_name,
-      builder_number=options.build_number,
-      results_directory=options.results_directory,
-      chrome_revision=options.chrome_revision,
-      master_name=options.master_name)
+  generate_json_results(results_map, options.builder_name,
+                        options.build_number, options.results_directory,
+                        options.chrome_revision, 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)]
 
+    files = [(f, os.path.join(options.results_directory, f)) for f in
+             (FULL_RESULTS_FILENAME, TIMES_MS_FILENAME)]
+
     # 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())