Rename --input-gtest-json flag to --input-json flag

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 69 matching lines @@
   generator.generate_times_ms_file()
 
 
 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-gtest-json',
+  option_parser.add_option('--input-json',
                            help='Test results json file (input for us).')
   option_parser.add_option('--builder-name',
                            default='DUMMY_BUILDER_NAME',
                            help='The name of the builder shown on the '
                                 'waterfall running this script e.g. WebKit.')
   option_parser.add_option('--build-number',
                            help='The build number of the builder running'
                                 'this script.')
   option_parser.add_option('--test-results-server',
                            help='The test results server to upload the '
                                 'results.')
   option_parser.add_option('--master-name',
                            help='The name of the buildbot master. '
                                 'Both test-results-server and master-name '
                                 'need to be specified to upload the results '
                                 'to the server.')
   option_parser.add_option('--chrome-revision', default='0',
                            help='The Chromium revision being tested. If not '
                                 'given, defaults to 0.')
 
   options = option_parser.parse_args()[0]
   logging.basicConfig()
 
   if not options.test_type:
     option_parser.error('--test-type needs to be specified.')
     return 1
 
-  if not options.input_gtest_json:
-    option_parser.error('--input-gtest-json needs to be specified.')
+  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_gtest_json) as json_file:
+  with file(options.input_json) as json_file:
     results_map = get_results_map_from_json(json_file.read())
 
   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())