Update from https://crrev.com/304121

build/android/pylib/base/test_dispatcher_unittest.py

 # Copyright 2013 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.
 
 """Unittests for test_dispatcher.py."""
 # pylint: disable=R0201
 # pylint: disable=W0212
 
 import os
 import sys
 import unittest
 
 sys.path.append(os.path.join(os.path.dirname(os.path.realpath(__file__)),
                 os.pardir, os.pardir))
 
 # Mock out android_commands.GetAttachedDevices().
 from pylib import android_commands
 android_commands.GetAttachedDevices = lambda: ['0', '1']
 from pylib import constants
 from pylib.base import base_test_result
+from pylib.base import test_collection
 from pylib.base import test_dispatcher
 from pylib.utils import watchdog_timer
 
 
 class TestException(Exception):
   pass
 
 
 class MockRunner(object):
   """A mock TestRunner."""
@@ skipping 45 matching lines @@
 class MockRunnerException(MockRunner):
   def RunTest(self, test):
     raise TestException
 
 
 class TestFunctions(unittest.TestCase):
   """Tests test_dispatcher._RunTestsFromQueue."""
   @staticmethod
   def _RunTests(mock_runner, tests):
     results = []
-    tests = test_dispatcher._TestCollection(
+    tests = test_collection.TestCollection(
         [test_dispatcher._Test(t) for t in tests])
     test_dispatcher._RunTestsFromQueue(mock_runner, tests, results,
                                        watchdog_timer.WatchdogTimer(None), 2)
     run_results = base_test_result.TestRunResults()
     for r in results:
       run_results.AddTestRunResults(r)
     return run_results
 
   def testRunTestsFromQueue(self):
     results = TestFunctions._RunTests(MockRunner(), ['a', 'b'])
@@ skipping 25 matching lines @@
   def testApplyMaxPerRun(self):
     self.assertEqual(
         ['A:B', 'C:D', 'E', 'F:G', 'H:I'],
         test_dispatcher.ApplyMaxPerRun(['A:B', 'C:D:E', 'F:G:H:I'], 2))
 
 
 class TestThreadGroupFunctions(unittest.TestCase):
   """Tests test_dispatcher._RunAllTests and test_dispatcher._CreateRunners."""
   def setUp(self):
     self.tests = ['a', 'b', 'c', 'd', 'e', 'f', 'g']
-    shared_test_collection = test_dispatcher._TestCollection(
+    shared_test_collection = test_collection.TestCollection(
         [test_dispatcher._Test(t) for t in self.tests])
     self.test_collection_factory = lambda: shared_test_collection
 
   def testCreate(self):
     runners = test_dispatcher._CreateRunners(MockRunner, ['0', '1'])
     for runner in runners:
       self.assertEqual(runner.setups, 1)
     self.assertEqual(set([r.device_serial for r in runners]),
                      set(['0', '1']))
     self.assertEqual(set([r.shard_index for r in runners]),
@@ skipping 71 matching lines @@
 
   def testNoTests(self):
     results, exit_code = test_dispatcher.RunTests(
         [], MockRunner, ['0', '1'], shard=False)
     self.assertEqual(len(results.GetAll()), 0)
     self.assertEqual(exit_code, constants.ERROR_EXIT_CODE)
 
 
 if __name__ == '__main__':
   unittest.main()