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

build/android/pylib/gtest/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
 
 from pylib import android_commands
 from pylib import constants
 from pylib.android_commands import errors
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
 from pylib.utils import run_tests_helper
 
 import test_package_apk
 import test_package_executable
 
 
 # We're moving to using isolate files instead of harcoding
-# dependencies here. Look at the TODO in dispatch.py.
+# dependencies here. Look at the TODO in setup.py.
 def _GetDataFilesForTestSuite(test_suite_basename):
   """Returns a list of data files/dirs needed by the test suite.
 
   Args:
     test_suite_basename: The test suite basename (e.g. base_unittests).
 
   Returns:
     A list of test file and directory paths.
   """
   # Ideally, we'd just push all test data. However, it has >100MB, and a lot
@@ skipping 142 matching lines @@
                cleanup_test_files, tool_name, build_type,
                in_webkit_checkout, push_deps, test_apk_package_name=None,
                test_activity_name=None, command_line_file=None, deps_dir=None):
     super(TestRunner, self).__init__(device, tool_name, build_type, push_deps)
     self._running_on_emulator = self.device.startswith('emulator')
     self._test_arguments = test_arguments
     self.in_webkit_checkout = in_webkit_checkout
     self._cleanup_test_files = cleanup_test_files
     self._deps_dir = deps_dir
 
-    logging.warning('Test suite: ' + test_suite)
+    logging.warning('Test suite: ' + str(test_suite))
     if os.path.splitext(test_suite)[1] == '.apk':
       self.test_package = test_package_apk.TestPackageApk(
           self.adb,
           device,
           test_suite,
           timeout,
           self._cleanup_test_files,
           self.tool,
           test_apk_package_name,
           test_activity_name,
@@ skipping 109 matching lines @@
       self.LaunchChromeTestServerSpawner()
     self.tool.SetupEnvironment()
 
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.tool.CleanUpEnvironment()
     if self._cleanup_test_files:
       self.adb.RemovePushedFiles()
     super(TestRunner, self).TearDown()