Upstream changes to python tests.

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
 import time
 
 from pylib import android_commands
 from pylib import python_test_base
 from pylib import python_test_sharder
 from pylib import test_options_parser
 from pylib import test_result
 
 
 class MonkeyTest(python_test_base.PythonTestBase):
-  def __init__(self, test_name, options):
-    self.options = options
-    super(MonkeyTest, self).__init__(test_name)
-
   def testMonkey(self):
     start_ms = int(time.time()) * 1000
 
     # Launch and wait for Chrome to launch.
     self.adb.StartActivity(self.options.package_name,
                            self.options.activity_name,
                            wait_for_completion=True,
                            action='android.intent.action.MAIN')
 
     # Chrome crashes are not always caught by Monkey test runner.
@@ skipping 66 matching lines @@
   logger.setLevel(logging.DEBUG)
 
   available_tests = [MonkeyTest('testMonkey', options)]
   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.')
   available_tests *= len(attached_devices)
+  options.ensure_value('shard_retries',1)
   sharder = python_test_sharder.PythonTestSharder(
-      attached_devices, 1, available_tests)
+      attached_devices, available_tests, options)
   result = sharder.RunShardedTests()
   result.LogFull('Monkey', 'Monkey', options.build_type)
   result.PrintAnnotation()
 
 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',
@@ skipping 10 matching lines @@
   parser.add_option('--event-count', default=10000, type='int',
                     help='Number of events to generate [default: %default].')
   parser.add_option('--verbosity', default=1, type='int',
                     help='Verbosity level [0-3] [default: %default].')
   parser.add_option('--extra-args', default='',
                     help=('String of other args to pass to the command verbatim'
                           ' [default: "%default"].'))
   (options, args) = parser.parse_args()
 
   if args:
+    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)
 
 
 if __name__ == '__main__':
   main()