Parallelize telemetry unit tests on Android bots

tools/telemetry/telemetry/unittest_util/run_tests.py

 # Copyright 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 sys
 
 from telemetry import decorators
 from telemetry.core import browser_finder
 from telemetry.core import browser_finder_exceptions
 from telemetry.core import browser_options
 from telemetry.core import command_line
+from telemetry.core import device_finder
 from telemetry.core import util
 from telemetry.unittest_util import options_for_unittests
 from telemetry.unittest_util import browser_test_case
 
 util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'third_party', 'typ')
 
 import typ
 
 
 class RunTestsCommand(command_line.OptparseCommand):
@@ skipping 68 matching lines @@
 
     runner = typ.Runner()
     if self.stream:
       runner.host.stdout = self.stream
 
     # Telemetry seems to overload the system if we run one test per core,
     # so we scale things back a fair amount. Many of the telemetry tests
     # are long-running, so there's a limit to how much parallelism we
     # can effectively use for now anyway.
     #
-    # It should be possible to handle multiple devices if we adjust
-    # the browser_finder code properly, but for now we only handle the one
-    # on Android and ChromeOS.
-    if possible_browser.platform.GetOSName() in ('android', 'chromeos'):
+    # It should be possible to handle multiple devices if we adjust the
+    # browser_finder code properly, but for now we only handle one on ChromeOS.
+    if possible_browser.platform.GetOSName() == 'chromeos':
       runner.args.jobs = 1
+    elif possible_browser.platform.GetOSName() == 'android':
+      runner.args.jobs = len(device_finder.GetDevicesMatchingOptions(args))
+      print 'Running tests with %d Android device(s).' % runner.args.jobs
     elif possible_browser.platform.GetOSVersionName() == 'xp':
       # For an undiagnosed reason, XP falls over with more parallelism.
       # See crbug.com/388256
       runner.args.jobs = max(int(args.jobs) // 4, 1)
     else:
       runner.args.jobs = max(int(args.jobs) // 2, 1)
 
     runner.args.metadata = args.metadata
     runner.args.passthrough = args.passthrough
     runner.args.path = args.path
@@ skipping 51 matching lines @@
   if not selected_tests:
     return False
   if selected_tests_are_exact:
     return any(name in selected_tests)
   else:
     return any(test in name for test in selected_tests)
 
 
 def _SetUpProcess(child, context): # pylint: disable=W0613
   args = context
+  if args.device and args.device == 'android':
+    android_devices = device_finder.GetDevicesMatchingOptions(args)
+    args.device = android_devices[child.worker_num-1].guid
   options_for_unittests.Push(args)
 
 
 def _TearDownProcess(child, context): # pylint: disable=W0613
   browser_test_case.teardown_browser()
   options_for_unittests.Pop()
 
 
 if __name__ == '__main__':
   ret_code = RunTestsCommand.main()
   sys.exit(ret_code)