[Android] Fix UIAutomator, Linker, and downstream tests.

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
@@ skipping 12 matching lines @@
 
 
 
 class TestException(Exception):
   pass
 
 
 class MockRunner(object):
   """A mock TestRunner."""
   def __init__(self, device='0', shard_index=0):
-    self.device = device
+    self.device_serial = device
     self.shard_index = shard_index
     self.setups = 0
     self.teardowns = 0
 
   def RunTest(self, test):
     results = base_test_result.TestRunResults()
     results.AddResult(
         base_test_result.BaseTestResult(test, base_test_result.ResultType.PASS))
     return (results, None)
 
@@ skipping 82 matching lines @@
   def setUp(self):
     self.tests = ['a', 'b', 'c', 'd', 'e', 'f', 'g']
     shared_test_collection = test_dispatcher._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 for r in runners]),
+    self.assertEqual(set([r.device_serial for r in runners]),
                      set(['0', '1']))
     self.assertEqual(set([r.shard_index for r in runners]),
                      set([0, 1]))
 
   def testRun(self):
     runners = [MockRunner('0'), MockRunner('1')]
     results, exit_code = test_dispatcher._RunAllTests(
         runners, self.test_collection_factory, 0)
     self.assertEqual(len(results.GetPass()), len(self.tests))
     self.assertEqual(exit_code, 0)
@@ skipping 72 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()