Makes host driven tests use the common sharder.

build/android/run_monkey_test.py

 #!/usr/bin/env python
 # 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.
 
 """Runs the Monkey tests on one or more devices."""
 import logging
 import optparse
 import random
 import sys
 
 from pylib import android_commands
+from pylib import dispatch
 from pylib.base import base_test_result
 from pylib.host_driven import python_test_base
 from pylib.host_driven import python_test_sharder
 from pylib.utils import report_results
 from pylib.utils import test_options_parser
 
 
 class MonkeyTest(python_test_base.PythonTestBase):
   def testMonkey(self):
     # Launch and wait for Chrome to launch.
@@ skipping 57 matching lines @@
            '--throttle %d' % throttle,
            '-s %d' % seed,
            '-v ' * verbosity,
            '--monitor-native-crashes',
            '--kill-process-after-error',
            extra_args,
            '%d' % event_count]
     return self.adb.RunShellCommand(' '.join(cmd), timeout_time=timeout_ms)
 
 
-def DispatchPythonTests(options):
-  """Dispatches the Monkey tests, sharding it if there multiple devices."""
+def RunMonkeyTests(options):
+  """Runs the Monkey tests, sharding it if there multiple devices."""
   logger = logging.getLogger()
   logger.setLevel(logging.DEBUG)
-  attached_devices = android_commands.GetAttachedDevices()
-  if not attached_devices:
-    raise Exception('You have no devices attached or visible!')
 
   # Actually run the tests.
   logging.debug('Running monkey tests.')
-  # TODO(frankf): This is a stop-gap solution. Come up with a
-  # general way for running tests on every devices.
-  available_tests = []
-  for k in range(len(attached_devices)):
-    new_method = 'testMonkey%d' % k
-    setattr(MonkeyTest, new_method, MonkeyTest.testMonkey)
-    available_tests.append(MonkeyTest(new_method))
-  options.ensure_value('shard_retries', 1)
-  sharder = python_test_sharder.PythonTestSharder(
-      attached_devices, available_tests, options)
-  results = sharder.RunShardedTests()
+  available_tests = [MonkeyTest('testMonkey')]
+
+  def TestRunnerFactory(device, shard_index):
+    return python_test_sharder.PythonTestRunner(options, device, shard_index)
+
+  results, exit_code = dispatch.Dispatch(
+      options, available_tests, TestRunnerFactory, sharding='duplicate')
   report_results.LogFull(
       results=results,
       test_type='Monkey',
       test_package='Monkey',
       build_type=options.build_type)
-  # TODO(gkanwar): After the host-driven tests have been refactored, they sould
-  # use the comment exit code system (part of pylib/base/shard.py)
-  if not results.DidRunPass():
-    return 1
-  return 0
+
+  return exit_code
 
 
 def main():
   desc = 'Run the Monkey tests on 1 or more devices.'
   parser = optparse.OptionParser(description=desc)
   test_options_parser.AddBuildTypeOption(parser)
   parser.add_option('--package-name', help='Allowed package.')
   parser.add_option('--activity-name',
                     default='com.google.android.apps.chrome.Main',
                     help='Name of the activity to start [default: %default].')
@@ skipping 18 matching lines @@
     parser.print_help(sys.stderr)
     parser.error('Unknown arguments: %s' % args)
 
   if not options.package_name:
     parser.print_help(sys.stderr)
     parser.error('Missing package name')
 
   if options.category:
     options.category = options.category.split(',')
 
-  DispatchPythonTests(options)
+  RunMonkeyTests(options)
 
 
 if __name__ == '__main__':
   main()