[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
 import re
 
 from pylib import android_commands
 from pylib import constants
@@ skipping 40 matching lines @@
                                      cleanup_test_files)
     self._test_arguments = test_arguments
     self.in_webkit_checkout = in_webkit_checkout
     if timeout == 0:
       timeout = 60
     # On a VM (e.g. chromium buildbots), this timeout is way too small.
     if os.environ.get('BUILDBOT_SLAVENAME'):
       timeout = timeout * 2
     self.timeout = timeout * self.tool.GetTimeoutScale()
 
-    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,
           self.tool,
           test_apk_package_name,
           test_activity_name,
           command_line_file)
     else:
@@ skipping 161 matching lines @@
     super(TestRunner, self).SetUp()
     if _TestSuiteRequiresMockTestServer(self.test_package.test_suite_basename):
       self.LaunchChromeTestServerSpawner()
     self.tool.SetupEnvironment()
 
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.tool.CleanUpEnvironment()
     super(TestRunner, self).TearDown()