Merge test results presentation of multiple shards.

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

Index: build/android/pylib/results/presentation/test_results_presentation.py
diff --git a/build/android/pylib/results/presentation/test_results_presentation.py b/build/android/pylib/results/presentation/test_results_presentation.py
index 659917382271049244f37efaa9877d7fd7ffefd6..de9c2146307f603499c413c4ff830bf7ed951da4 100755
--- a/build/android/pylib/results/presentation/test_results_presentation.py
+++ b/build/android/pylib/results/presentation/test_results_presentation.py
@@ -1,4 +1,4 @@
-#! /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
@@ -12,6 +12,8 @@ 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, '..', '..', '..', '..', '..'))
@@ -401,8 +403,13 @@ def main():
 
   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