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

build/android/pylib/host_driven/python_test_sharder.py

 # 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.
 
 """Takes care of sharding the python-drive tests in multiple devices."""
 
 import copy
 import logging
 import multiprocessing
 
@@ skipping 77 matching lines @@
     options: Options to use for setting up tests.
 
   Returns:
     An aggregated list of test results.
   """
   tests_container = None
 
   def __init__(self, attached_devices, available_tests, options):
     self.options = options
     self.attached_devices = attached_devices
-    self.retries = options.shard_retries
+    self.retries = options.num_retries
     self.tests = available_tests
 
   def _SetupSharding(self, tests):
     """Creates the shared pool of tests and makes it available to test runners.
 
     Args:
       tests: the list of tests which will be consumed by workers.
     """
     SetTestsContainer(sharded_tests_queue.ShardedTestsQueue(
         len(self.attached_devices), tests))
@@ skipping 85 matching lines @@
       available_tests: a list of tests which subclass PythonTestBase.
       failed_test_names: a list of failed test names.
 
     Returns:
       A list of test objects which correspond to test names found in
       failed_test_names, or an empty list if there is no correspondence.
     """
     tests_to_retry = [t for t in available_tests
                       if t.qualified_name in failed_test_names]
     return tests_to_retry