[Android] Re-write the gtest TestRunner and introduce a new generic sharder.

build/android/pylib/base/new_base_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 contextlib
 import httplib
 import logging
 import os
 import tempfile
 import time
@@ skipping 14 matching lines @@
 NET_TEST_SERVER_PORT_INFO_FILE = 'net-test-server-ports'
 
 
 class BaseTestRunner(object):
   """Base class for running tests on a single device.
 
   A subclass should implement RunTests() with no parameter, so that calling
   the Run() method will set up tests, run them and tear them down.
   """
 
-  def __init__(self, device, tool, shard_index, build_type):
+  def __init__(self, device, tool, build_type):
     """
       Args:
         device: Tests will run on the device of this ID.
         shard_index: Index number of the shard on which the test suite will run.
         build_type: 'Release' or 'Debug'.
     """
     self.device = device
     self.adb = android_commands.AndroidCommands(device=device)
     self.tool = CreateTool(tool, self.adb)
     self._http_server = None
     self._forwarder = None
     self._forwarder_device_port = 8000
     self.forwarder_base_url = ('http://localhost:%d' %
         self._forwarder_device_port)
     self.flags = FlagChanger(self.adb)
-    self.shard_index = shard_index
     self.flags.AddFlags(['--disable-fre'])
     self._spawning_server = None
     self._spawner_forwarder = None
     # We will allocate port for test server spawner when calling method
     # LaunchChromeTestServerSpawner and allocate port for test server when
     # starting it in TestServerThread.
     self.test_server_spawner_port = 0
     self.test_server_port = 0
     self.build_type = build_type
 
   def _PushTestServerPortInfoToDevice(self):
     """Pushes the latest port information to device."""
     self.adb.SetFileContents(self.adb.GetExternalStorage() + '/' +
                              NET_TEST_SERVER_PORT_INFO_FILE,
                              '%d:%d' % (self.test_server_spawner_port,
                                         self.test_server_port))
 
-  def Run(self):
-    """Calls subclass functions to set up tests, run them and tear them down.
+  def Run(self, test):
+    """Calls subclass functions to set up test, run it and tear it down.
+
+    Args:
+      test: A Test to run.
 
     Returns:
-      Test results returned from RunTests().
+      Test results returned from RunTest(test).
     """
-    if not self.HasTests():
-      return True
     self.SetUp()
     try:
-      return self.RunTests()
+      return self.RunTest(test)
     finally:
       self.TearDown()
 
   def SetUp(self):
     """Called before tests run."""
     Forwarder.KillDevice(self.adb, self.tool)
 
-  def HasTests(self):
-    """Whether the test suite has tests to run."""
-    return True
-
-  def RunTests(self):
-    """Runs the tests. Need to be overridden."""
+  def RunTest(self, test):
+    """Runs the tests. Needs to be overridden."""
     raise NotImplementedError
 
   def TearDown(self):
     """Called when tests finish running."""
     self.ShutdownHelperToolsForTestSuite()
 
   def CopyTestData(self, test_data_paths, dest_dir):
     """Copies |test_data_paths| list of files/directories to |dest_dir|.
 
     Args:
@@ skipping 98 matching lines @@
       # Wait for 2 seconds then restart.
       time.sleep(2)
     if not server_ready:
       logging.error(';'.join(error_msgs))
       raise Exception('Can not start the test spawner server.')
     self._PushTestServerPortInfoToDevice()
     self._spawner_forwarder = self._CreateAndRunForwarder(
         self.adb,
         [(self.test_server_spawner_port, self.test_server_spawner_port)],
         self.tool, '127.0.0.1', self.build_type)