Makes host driven tests use the common sharder.

build/android/pylib/gtest/dispatch.py

 # Copyright (c) 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.
 
-"""Dispatches GTests."""
+"""Runs GTests."""
 
 import copy
 import fnmatch
 import glob
 import logging
 import os
 import shutil
 
 from pylib import android_commands
 from pylib import cmd_helper
 from pylib import constants
+from pylib import dispatch
 from pylib import ports
 from pylib.base import base_test_result
 from pylib.base import shard
 from pylib.utils import emulator
 from pylib.utils import report_results
-from pylib.utils import xvfb
 
 import gtest_config
 import test_runner
 
 
 # TODO(frankf): Add more test targets here after making sure we don't
 # blow up the dependency size (and the world).
 _ISOLATE_FILE_PATHS = {
     'base_unittests': 'base/base_unittests.isolate',
     'unit_tests': 'chrome/unit_tests.isolate',
@@ skipping 167 matching lines @@
                 all_tests)
 
 
 def GetAllEnabledTests(runner_factory, devices):
   """Get all enabled tests.
 
   Obtains a list of enabled tests from the test package on the device,
   then filters it again using the disabled list on the host.
 
   Args:
-    runner_factory: callable that takes a devices and returns a TestRunner.
-    devices: list of devices.
+    runner_factory: callable that takes devide and shard_index and returns

[frankf, 2013/07/12 22:28:28]

?

[gkanwar, 2013/07/12 22:53:34]

s/devide/device/

Fixed.

+        a TestRunner.
 
   Returns:
     List of all enabled tests.
 
   Raises:
     Exception: If no devices available.
   """
   for device in devices:
     try:
       logging.info('Obtaining tests from %s', device)
@@ skipping 16 matching lines @@
     options: options for running the tests.
     suite_name: name of the test suite being run.
 
   Returns:
     A tuple of (base_test_result.TestRunResult object, exit code).
 
   Raises:
     Exception: For various reasons including device failure or failing to reset
         the test server port.
   """
-  attached_devices = []
-  buildbot_emulators = []
-
-  if options.use_emulator:
-    buildbot_emulators = emulator.LaunchEmulators(options.emulator_count,
-                                                  options.abi,
-                                                  wait_for_boot=True)
-    attached_devices = [e.device for e in buildbot_emulators]
-  elif options.test_device:
-    attached_devices = [options.test_device]
-  else:
-    attached_devices = android_commands.GetAttachedDevices()
-
-  if not attached_devices:
-    raise Exception('A device must be attached and online.')
 
   # Reset the test port allocation. It's important to do it before starting
   # to dispatch any tests.
   if not ports.ResetTestServerPortAllocation():

[frankf, 2013/07/12 22:28:28]

There's still a lot of duplication in dispatch files. Essentially, all you're
really doing is taking options as the input, and returning the tuple (test
runner factory, tests, shard vs. replicate).

[gkanwar, 2013/07/12 22:53:34]

I think the only duplication that exists currently is logging and the
ResetTestServerPortAllocation for content_browsertests and gtests. Perhaps we
should move logging out into test_runner. For the test server ports, I meant to
put a TODO here, but it should probably get moved out of RunGTests also... just
not sure where yet.

For gtests and content_browsertests there is also some amount of duplication in
how we get the tests, since they are so similar. Perhaps we could move that out
into a function for gtests and have content_browsertests import and call that
function with a paramater to indicate it should get the content_browser suite?

     raise Exception('Failed to reset test server port.')
 
   deps_dir = _GenerateDepsDirUsingIsolate(suite_name, options.build_type)
 
   # Constructs a new TestRunner with the current options.
-  def RunnerFactory(device, shard_index):
+  def TestRunnerFactory(device, shard_index):
     return test_runner.TestRunner(
         device,
         options.test_suite,
         options.test_arguments,
         options.timeout,
         options.cleanup_test_files,
         options.tool,
         options.build_type,
         options.webkit,
         options.push_deps,
         constants.GTEST_TEST_PACKAGE_NAME,
         constants.GTEST_TEST_ACTIVITY_NAME,
         constants.GTEST_COMMAND_LINE_FILE,
         deps_dir=deps_dir)
 
+  # TODO(gkanwar): This breaks the abstraction of having dispatch.Dispatch deal
+  # entirely with the devices. Can we do this another way?
+  attached_devices = android_commands.GetAttachedDevices()
   # Get tests and split them up based on the number of devices.
   if options.test_filter:
     all_tests = [t for t in options.test_filter.split(':') if t]
   else:
-    all_tests = GetAllEnabledTests(RunnerFactory, attached_devices)
+    all_tests = GetAllEnabledTests(TestRunnerFactory, attached_devices)
   num_devices = len(attached_devices)
   tests = [':'.join(all_tests[i::num_devices]) for i in xrange(num_devices)]
   tests = [t for t in tests if t]
 
   # Run tests.
-  test_results, exit_code = shard.ShardAndRunTests(
-      RunnerFactory, attached_devices, tests, options.build_type,
-      test_timeout=None, num_retries=options.num_retries)
+  test_results, exit_code = dispatch.Dispatch(options, tests, TestRunnerFactory,
+                                              sharding='distribute')
 
   report_results.LogFull(
       results=test_results,
       test_type='Unit test',
       test_package=suite_name,
       build_type=options.build_type,
       flakiness_server=options.flakiness_dashboard_server)
 
-  for buildbot_emulator in buildbot_emulators:
-    buildbot_emulator.Shutdown()
 
   return (test_results, exit_code)
 
 
 def _ListTestSuites():
   """Display a list of available test suites."""
   print 'Available test suites are:'
   for test_suite in gtest_config.STABLE_TEST_SUITES:
     print test_suite
 
 
-def Dispatch(options):
-  """Dispatches the tests, sharding if possible.
+def RunGTests(options):
+  """Runs the tests, sharding if possible.
 
   If options.use_emulator is True, all tests will be run in new emulator
   instance.
 
   Args:
     options: options for running the tests.
 
   Returns:
     base_test_result.TestRunResults object with the results of running the tests
   """
   results = base_test_result.TestRunResults()
 
   if options.test_suite == 'help':
     _ListTestSuites()
     return (results, 0)
 
-  if options.use_xvfb:
-    framebuffer = xvfb.Xvfb()
-    framebuffer.Start()
-
   all_test_suites = _FullyQualifiedTestSuites(options.exe, options.test_suite,
                                               options.build_type)
   exit_code = 0
   for suite_name, suite_path in all_test_suites:
     # Give each test suite its own copy of options.
     test_options = copy.deepcopy(options)
     test_options.test_suite = suite_path
     test_results, test_exit_code = _RunATestSuite(test_options, suite_name)
     results.AddTestRunResults(test_results)
     if test_exit_code and exit_code != constants.ERROR_EXIT_CODE:
       exit_code = test_exit_code
 
-  if options.use_xvfb:
-    framebuffer.Stop()
-
   return (results, exit_code)