[Android] Redesigns the sharder to allow replicated vs distributed tests

build/android/pylib/utils/report_results.py

 # Copyright (c) 2013 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.
 
 """Module containing utility functions for reporting results."""
 
 import logging
 import os
 import re
 
 from pylib import constants
 
 import flakiness_dashboard_results_uploader
 
 
-def _LogToFile(results, test_type, test_suite, build_type):
+def _LogToFile(results, test_type, suite_name, build_type):
   """Log results to local files which can be used for aggregation later."""
   log_file_path = os.path.join(constants.DIR_SOURCE_ROOT, 'out',
                                build_type, 'test_logs')
   if not os.path.exists(log_file_path):
     os.mkdir(log_file_path)
   full_file_name = os.path.join(
       log_file_path, re.sub('\W', '_', test_type).lower() + '.log')
   if not os.path.exists(full_file_name):
     with open(full_file_name, 'w') as log_file:
       print >> log_file, '\n%s results for %s build %s:' % (
           test_type, os.environ.get('BUILDBOT_BUILDERNAME'),
           os.environ.get('BUILDBOT_BUILDNUMBER'))
     logging.info('Writing results to %s.' % full_file_name)
 
   logging.info('Writing results to %s.' % full_file_name)
   with open(full_file_name, 'a') as log_file:
-    shortened_suite_name = test_suite[:25] + (test_suite[25:] and '...')
+    shortened_suite_name = suite_name[:25] + (suite_name[25:] and '...')
     print >> log_file, '%s%s' % (shortened_suite_name.ljust(30),
                                  results.GetShortForm())
 
 
 def _LogToFlakinessDashboard(results, test_type, test_package,
                              flakiness_server):
   """Upload results to the flakiness dashboard"""
   logging.info('Upload results for test type "%s", test package "%s" to %s' %
                (test_type, test_package, flakiness_server))
 
@@ skipping 50 matching lines @@
   logging.critical('Summary')
   logging.critical('*' * 80)
   for line in results.GetLongForm().splitlines():
     logging.critical(line)
   logging.critical('*' * 80)
 
   if os.environ.get('BUILDBOT_BUILDERNAME'):
     # It is possible to have multiple buildbot steps for the same
     # instrumenation test package using different annotations.
     if annotation and len(annotation) == 1:
-      test_suite = annotation[0]
+      suite_name = annotation[0]
     else:
-      test_suite = test_package
-    _LogToFile(results, test_type, test_suite, build_type)
+      suite_name = test_package
+    _LogToFile(results, test_type, suite_name, build_type)
 
     if flakiness_server:
       _LogToFlakinessDashboard(results, test_type, test_package,
                                flakiness_server)