Make test results presentation enabled for swarming.

build/android/pylib/results/presentation/test_results_presentation.py

 #! /usr/bin/env python
 #
 # Copyright 2017 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 argparse
 import collections
 import json
 import tempfile
@@ skipping 290 matching lines @@
     gsutil_path = os.path.join(BASE_DIR, 'third_party', 'catapult',
                                'third_party', 'gsutil', 'gsutil.py')
     subprocess.check_call([
         sys.executable, gsutil_path, '-h', "Content-Type:%s" % content_type,
         'cp', temp_file.name, 'gs://%s/%s' % (bucket, dest)])
 
   return '%s/%s/%s' % (server_url, bucket, dest)
 
 def main():
   parser = argparse.ArgumentParser()
-  parser.add_argument('--json-file', help='Path of json file.', required=True)
+  parser.add_argument('--json-file', help='Path of json file.')
   parser.add_argument('--cs-base-url', help='Base url for code search.',
                       default='http://cs.chromium.org')
   parser.add_argument('--bucket', help='Google storage bucket.', required=True)
-  parser.add_argument('--builder-name', help='Builder name.', required=True)
-  parser.add_argument('--build-number', help='Build number.', required=True)
+  parser.add_argument('--builder-name', help='Builder name.')
+  parser.add_argument('--build-number', help='Build number.')
   parser.add_argument('--test-name', help='The name of the test.',
                       required=True)
   parser.add_argument('--server-url', help='The url of the server.',
                       default='https://storage.cloud.google.com')
   parser.add_argument(
       '--content-type',
       help=('Content type, which is used to determine '
             'whether to download the file, or view in browser.'),
       default='text/html',
       choices=['text/html', 'application/octet-stream'])
+  parser.add_argument(
+      '-o', '--output-json',
+      help='(Swarming Isolated Merge Script API)'

[jbudorick, 2017/04/17 13:00:46]

This should just be "(Swarming Merge Script API)", not "(Swarming Isolated Merge
Script API)"

[BigBossZhiling, 2017/04/17 20:23:11]

Done.

+           ' Output JSON file to create.')
+  parser.add_argument(
+      '--build-properties',
+      help='(Swarming Isolated Merge Script API) '
+           'Build property JSON file provided by recipes.')
+  parser.add_argument(
+      '--summary-json',
+      help='(Swarming Isolated Merge Script API)'
+           ' Summary of shard state running on swarming.'

[mikecase (-- gone --), 2017/04/17 17:59:20]

nit, you need a space at the end of this line or beginning of next.

[BigBossZhiling, 2017/04/17 20:23:11]

Done.

+           '(Output of the swarming.py collect'
+           ' --task-summary-json=XXX command.)')
+  parser.add_argument(
+      'positional', nargs='*',

[mikecase (-- gone --), 2017/04/17 17:59:20]

Im not familiar with this swarming merge scripts. This accepts possibly many
arguments but you only ever use args.positional[0]. Is this correct?

[BigBossZhiling, 2017/04/17 20:23:11]

Acknowledged.

+      help='output.json from shards.')
+
 
   args = parser.parse_args()
-  if os.path.exists(args.json_file):
-    result_html_string = result_details(args.json_file, args.cs_base_url,
+
+  if (args.build_properties and args.output_json and

[jbudorick, 2017/04/17 13:00:46]

Instead of splitting like this, handle these arguments individually. Load the
build properties if they're passed, set the build number (1) if it's passed
explicitly or (2) if it's in the build properties, etc.

[BigBossZhiling, 2017/04/17 20:23:11]

Done.

+      args.summary_json and args.positional):
+    is_swarming = True
+  else:
+    is_swarming = False
+
+  if is_swarming:
+    build_properties = json.loads(args.build_properties)
+    build_number = build_properties['buildnumber']
+    builder_name = build_properties['buildname']
+    output_json = args.output_json
+    json_file = args.positional[0]
+  else:
+    json_file = args.json_file
+    build_number = args.build_number
+    builder_name = args.builder_name
+
+  if os.path.exists(json_file):
+    result_html_string = result_details(json_file, args.cs_base_url,
                                         args.bucket, args.server_url)
-    print upload_to_google_bucket(result_html_string.encode('UTF-8'),
-                                  args.test_name, args.builder_name,
-                                  args.build_number, args.bucket,
-                                  args.server_url, args.content_type)
+    result_details_link = upload_to_google_bucket(
+        result_html_string.encode('UTF-8'),
+        args.test_name, builder_name,
+        build_number, args.bucket,
+        args.server_url, args.content_type)
+
+    if is_swarming:

[jbudorick, 2017/04/17 13:00:46]

Similarly, write the output json if output_json is passed to the script.

[BigBossZhiling, 2017/04/17 20:23:11]

Done.

+      with open(json_file) as original_json_file:
+        json_object = json.loads(original_json_file.read())
+        json_object['links'] = {'result_details': result_details_link}
+        with open(output_json, 'w') as f:
+          f.write(str(json_object))
+    else:
+      print result_details_link
   else:
     raise IOError('--json-file %s not found.' % args.json_file)
 
 
 if __name__ == '__main__':
   sys.exit(main())