[Android] Switch instrumentation tests to the new shard/runner paradigm.

build/android/pylib/base/base_test_sharder.py

Index: build/android/pylib/base/base_test_sharder.py
diff --git a/build/android/pylib/base/base_test_sharder.py b/build/android/pylib/base/base_test_sharder.py
deleted file mode 100644
index be221987528645fed12a790ad0be70879fabe07f..0000000000000000000000000000000000000000
--- a/build/android/pylib/base/base_test_sharder.py
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright (c) 2012 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 logging
-import multiprocessing
-
-from pylib import android_commands
-from pylib.base.test_result import TestResults
-from pylib.forwarder import Forwarder
-
-
-# Number of times we retry a test suite in case of failure.
-NUM_RETRIES = 3
-
-
-def _ShardedTestRunnable(test):
-  """Standalone function needed by multiprocessing.Pool."""
-  log_format = '[' + test.device + '] # %(asctime)-15s: %(message)s'
-  if logging.getLogger().handlers:
-    logging.getLogger().handlers[0].setFormatter(logging.Formatter(log_format))
-  else:
-    logging.basicConfig(format=log_format)
-  # Handle SystemExit here since python has a bug to exit current process
-  try:
-    return test.Run()
-  except SystemExit:
-    return TestResults()
-
-
-def SetTestsContainer(tests_container):
-  """Sets tests container.
-
-  multiprocessing.Queue can't be pickled across processes, so we need to set
-  this as a 'global', per process, via multiprocessing.Pool.
-  """
-  BaseTestSharder.tests_container = tests_container
-
-
-class BaseTestSharder(object):
-  """Base class for sharding tests across multiple devices.
-
-  Args:
-    attached_devices: A list of attached devices.
-  """
-  # See more in SetTestsContainer.
-  tests_container = None
-
-  def __init__(self, attached_devices, build_type='Debug'):
-    self.attached_devices = attached_devices
-    # Worst case scenario: a device will drop offline per run, so we need
-    # to retry until we're out of devices.
-
-    # TODO(frankf): There are two sources of flakiness:
-    # 1. Device flakiness
-    # 2. Test/product flakiness
-    # We should differentiate between these. Otherwise, blindly retrying tests
-    # might mask test/product flakiness. For type 2, we should follow the
-    # general chrome best practices.
-    self.retries = NUM_RETRIES
-    self.tests = []
-    self.build_type = build_type
-
-  def CreateShardedTestRunner(self, device, index):
-    """Factory function to create a suite-specific test runner.
-
-    Args:
-      device: Device serial where this shard will run
-      index: Index of this device in the pool.
-
-    Returns:
-      An object of BaseTestRunner type (that can provide a "Run()" method).
-    """
-    pass
-
-  def SetupSharding(self, tests):
-    """Called before starting the shards."""
-    pass
-
-  def _KillHostForwarder(self):
-    Forwarder.KillHost(self.build_type)
-
-  def RunShardedTests(self):
-    """Runs the tests in all connected devices.
-
-    Returns:
-      A TestResults object.
-    """
-    logging.warning('*' * 80)
-    logging.warning('Sharding in ' + str(len(self.attached_devices)) +
-                    ' devices.')
-    logging.warning('Note that the output is not synchronized.')
-    logging.warning('Look for the "Final result" banner in the end.')
-    logging.warning('*' * 80)
-    final_results = TestResults()
-    self._KillHostForwarder()
-    for retry in xrange(self.retries):
-      logging.warning('Try %d of %d', retry + 1, self.retries)
-      logging.warning('Attempting to run %d tests: %s'
-                      % (len(self.tests), self.tests))
-      self.SetupSharding(self.tests)
-      test_runners = []
-
-      # Try to create N shards, and retrying on failure.
-      try:
-        for index, device in enumerate(self.attached_devices):
-          logging.warning('*' * 80)
-          logging.warning('Creating shard %d for %s', index, device)
-          logging.warning('*' * 80)
-          test_runner = self.CreateShardedTestRunner(device, index)
-          test_runners += [test_runner]
-      except android_commands.errors.DeviceUnresponsiveError as e:
-        logging.critical('****Failed to create a shard: [%s]', e)
-        self.attached_devices.remove(device)
-        continue
-
-      logging.warning('Starting...')
-      pool = multiprocessing.Pool(len(self.attached_devices),
-                                  SetTestsContainer,
-                                  [BaseTestSharder.tests_container])
-      # map can't handle KeyboardInterrupt exception. It's a python bug.
-      # So use map_async instead.
-      async_results = pool.map_async(_ShardedTestRunnable, test_runners)
-      try:
-        results_lists = async_results.get(999999)
-      except android_commands.errors.DeviceUnresponsiveError as e:
-        logging.critical('****Failed to run test: [%s]', e)
-        self.attached_devices = android_commands.GetAttachedDevices()
-        continue
-      test_results = TestResults.FromTestResults(results_lists)
-      # Re-check the attached devices for some devices may
-      # become offline
-      retry_devices = set(android_commands.GetAttachedDevices())
-      # Remove devices that had exceptions.
-      retry_devices -= TestResults.DeviceExceptions(results_lists)
-      # Retry on devices that didn't have any exception.
-      self.attached_devices = list(retry_devices)
-
-      # TODO(frankf): Do not break TestResults encapsulation.
-      if (retry == self.retries - 1 or
-          len(self.attached_devices) == 0):
-        all_passed = final_results.ok + test_results.ok
-        final_results = test_results
-        final_results.ok = all_passed
-        break
-      else:
-        final_results.ok += test_results.ok
-
-        self.tests = []
-        for t in test_results.GetAllBroken():
-          self.tests += [t.name]
-        if not self.tests:
-          break
-    else:
-      # We ran out retries, possibly out of healthy devices.
-      # There's no recovery at this point.
-      raise Exception('Unrecoverable error while retrying test runs.')
-    self._KillHostForwarder()
-    return final_results