Upstream changes to python tests.

build/android/pylib/run_python_tests.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.
 
 """Runs the Python tests (relies on using the Java test runner)."""
 
 import logging
 import os
 import sys
 import types
@@ skipping 77 matching lines @@
     test_files_copier = run_java_tests.TestRunner(options, device_id,
                                                   None, False, 0, apks, [])
     test_files_copier.CopyTestFilesOnce()
 
   # Actually run the tests.
   if len(attached_devices) > 1 and options.wait_for_debugger:
     logging.warning('Debugger can not be sharded, '
                     'using first available device')
     attached_devices = attached_devices[:1]
   logging.debug('Running Python tests')
-  sharder = PythonTestSharder(attached_devices, options.shard_retries,
-                              available_tests)
+  sharder = PythonTestSharder(attached_devices, available_tests, options)
   test_results = sharder.RunShardedTests()
 
   return test_results
 
 
-def _RunPythonTests(tests_to_run, device_id):
-  """Runs a list of Python tests serially on one device and returns results.
-
-  Args:
-    tests_to_run: a list of objects inheriting from PythonTestBase.
-    device_id: ID of the device to run tests on.
-
-  Returns:
-    A list of test results, aggregated across all the tests run.
-  """
-  # This is a list of TestResults objects.
-  results = [CallPythonTest(t, device_id, 0) for t in tests_to_run]
-  # Merge the list of TestResults into one TestResults.
-  return TestResults.FromTestResults(results)
-
-
 def _GetTestModules(python_test_root, is_official_build):
   """Retrieve a sorted list of pythonDrivenTests.
 
   Walks the location of pythonDrivenTests, imports them, and provides the list
   of imported modules to the caller.
 
   Args:
     python_test_root: the path to walk, looking for pythonDrivenTests
     is_official_build: whether to run only those tests marked 'official'
 
@@ skipping 84 matching lines @@
   Returns:
     List of test case objects for all available test methods.
   """
   if not test_root:
     return []
   all_tests = []
   test_module_list = _GetTestModules(test_root, is_official_build)
   for module in test_module_list:
     all_tests.extend(_GetTestClassesFromModule(module))
   return all_tests