Upstream test sharder.

build/android/single_test_runner.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.
 
 import logging
 import os
 import sys
 
 from base_test_runner import BaseTestRunner
 import debug_info
 import run_tests_helper
 from test_package_executable import TestPackageExecutable
 from test_result import TestResults
 
 
 class SingleTestRunner(BaseTestRunner):
   """Single test suite attached to a single device.
 
   Args:
     device: Device to run the tests.
     test_suite: A specific test suite to run, empty to run all.
     gtest_filter: A gtest_filter flag.
     test_arguments: Additional arguments to pass to the test binary.
     timeout: Timeout for each test.
     rebaseline: Whether or not to run tests in isolation and update the filter.
     performance_test: Whether or not performance test(s).
     cleanup_test_files: Whether or not to cleanup test files on device.
     tool: Name of the Valgrind tool.
+    shard_index: index number of the shard on which the test suite will run.
     dump_debug_info: Whether or not to dump debug information.
   """
 
   def __init__(self, device, test_suite, gtest_filter, test_arguments, timeout,
                rebaseline, performance_test, cleanup_test_files, tool,
-               dump_debug_info=False,
+               shard_index, dump_debug_info=False,
                fast_and_loose=False):
-    BaseTestRunner.__init__(self, device)
+    BaseTestRunner.__init__(self, device, shard_index)
     self._running_on_emulator = self.device.startswith('emulator')
     self._gtest_filter = gtest_filter
     self._test_arguments = test_arguments
     self.test_results = TestResults()
     if dump_debug_info:
       self.dump_debug_info = debug_info.GTestDebugInfo(self.adb, device,
            os.path.basename(test_suite), gtest_filter)
     else:
       self.dump_debug_info = None
     self.fast_and_loose = fast_and_loose
@@ skipping 211 matching lines @@
                    str([f.name for f in failed_results]))
       logging.info('Remaining: ' + str(len(all_tests - executed_names)) + ' ' +
                    str(all_tests - executed_names))
       logging.info('*' * 80)
       if executed_names == all_tests:
         break
     self.test_results = TestResults.FromOkAndFailed(list(executed_results -
                                                          failed_results),
                                                     list(failed_results))
 
-  def _RunTestsForSuiteInternal(self):
-    """Runs all tests (in rebaseline mode, run each test in isolation).
+  def RunTests(self):
+    """Runs all tests (in rebaseline mode, runs each test in isolation).
 
     Returns:
       A TestResults object.
     """
     if self.test_package.rebaseline:
       self.RebaselineTests()
     else:
       if not self._gtest_filter:
         self._gtest_filter = ('-' + ':'.join(self.GetDisabledTests()) + ':' +
                              ':'.join(['*.' + x + '*' for x in
                                      self.test_package.GetDisabledPrefixes()]))
       self.RunTestsWithFilter()
+    return self.test_results
 
   def SetUp(self):
     """Sets up necessary test enviroment for the test suite."""
     super(SingleTestRunner, self).SetUp()
     if self.test_package.performance_test:
       if run_tests_helper.IsRunningAsBuildbot():
         self.adb.SetJavaAssertsEnabled(enable=False)
         self.adb.Reboot(full_reboot=False)
       self.adb.SetupPerformanceTest()
     if self.dump_debug_info:
       self.dump_debug_info.StartRecordingLog(True)
     self.StripAndCopyFiles()
     self.LaunchHelperToolsForTestSuite()
     self.test_package.tool.SetupEnvironment()
 
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
-    super(SingleTestRunner, self).TearDown()
     self.test_package.tool.CleanUpEnvironment()
     if self.test_package.cleanup_test_files:
       self.adb.RemovePushedFiles()
     if self.dump_debug_info:
       self.dump_debug_info.StopRecordingLog()
     if self.test_package.performance_test:
       self.adb.TearDownPerformanceTest()
-
-  def RunTests(self):
-    """Runs the tests and cleans up the files once finished.
-
-    Returns:
-      A TestResults object.
-    """
-    self.SetUp()
-    try:
-      self._RunTestsForSuiteInternal()
-    finally:
-      self.TearDown()
-    return self.test_results
+    super(SingleTestRunner, self).TearDown()