Merge test results presentation of multiple shards.

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

-#! /usr/bin/env python
+#!/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
 import os
 import sys
 import urllib
 
+from merge_test import merge_test

[jbudorick, 2017/06/19 13:33:42]

We generally import modules, not the contents thereof.

Also, for consistency, this should be

  from pylib.results.presentation import merge_test

(% whatever new name you pick for merge_test) and should be down below w/ the
other pylib import.

[BigBossZhiling, 2017/06/19 18:24:06]

Done.

+
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
 BASE_DIR = os.path.abspath(os.path.join(
     CURRENT_DIR, '..', '..', '..', '..', '..'))
 
 sys.path.append(os.path.join(BASE_DIR, 'build', 'android'))
 from pylib.utils import google_storage_helper  # pylint: disable=import-error
 
 sys.path.append(os.path.join(BASE_DIR, 'third_party'))
 import jinja2  # pylint: disable=import-error
 JINJA_ENVIRONMENT = jinja2.Environment(
@@ skipping 369 matching lines @@
         (not 'buildername' in build_properties)):
       raise parser.error('Build number/builder name not specified.')
     build_number = build_properties['buildnumber']
     builder_name = build_properties['buildername']
   elif args.build_number and args.builder_name:
     build_number = args.build_number
     builder_name = args.builder_name
 
   if args.positional:
     if not len(args.positional) == 1:
-      raise parser.error('More than 1 json file specified.')
-    json_file = args.positional[0]
+      if args.output_json and args.summary_json:
+        merge_test(args.output_json, args.summary_json, args.positional)
+        json_file = args.output_json
+      else:
+        raise Exception('Not complying with merge API.')

[jbudorick, 2017/06/19 13:33:42]

nit: this should say *why* the arguments aren't complying w/ the merge api.

+    else:
+      json_file = args.positional[0]
   elif args.json_file:
     json_file = args.json_file
 
   if not os.path.exists(json_file):
     raise IOError('--json-file %s not found.' % json_file)
 
   # Link to result details presentation page is a part of the page.
   result_html_string, dest, result_details_link = result_details(
       json_file, args.cs_base_url, args.bucket,
       args.test_name, builder_name, build_number)
@@ skipping 10 matching lines @@
     with open(json_file) as original_json_file:
       json_object = json.load(original_json_file)
       json_object['links'] = {'result_details': result_details_link}
       with open(args.output_json, 'w') as f:
         json.dump(json_object, f)
   else:
     print result_details_link
 
 if __name__ == '__main__':
   sys.exit(main())