Android: Make number of test retries configurable.

build/android/pylib/utils/test_options_parser.py

 # 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.
 
 """Parses options for the instrumentation tests."""
 
 #TODO(craigdh): pylib/utils/ should not depend on pylib/.
 from pylib import constants
 
 import optparse
@@ skipping 46 matching lines @@
 def AddTestRunnerOptions(option_parser, default_timeout=60):
   """Decorates OptionParser with options applicable to all tests."""
 
   option_parser.add_option('-t', dest='timeout',
                            help='Timeout to wait for each test',
                            type='int',
                            default=default_timeout)
   option_parser.add_option('-c', dest='cleanup_test_files',
                            help='Cleanup test files on the device after run',
                            action='store_true')
+  option_parser.add_option('--num_retries', dest='num_retries', type='int',
+                           default=2,
+                           help='Number of retries for a test before '
+                           'giving up.')
   option_parser.add_option('-v',
                            '--verbose',
                            dest='verbose_count',
                            default=0,
                            action='count',
                            help='Verbose level (multiple times for more)')
   profilers = ['devicestatsmonitor', 'chrometrace', 'dumpheap', 'smaps',
                'traceview']
   option_parser.add_option('--profiler', dest='profilers', action='append',
                            choices=profilers,
@@ skipping 33 matching lines @@
                            help='Run tests in a new instance of emulator.')
   option_parser.add_option('-n', '--emulator_count',
                            type='int', default=1,
                            help='Number of emulators to launch for running the '
                            'tests.')
   option_parser.add_option('-x', '--xvfb', dest='use_xvfb',
                            action='store_true',
                            help='Use Xvfb around tests (ignored if not Linux).')
   option_parser.add_option('--webkit', action='store_true',
                            help='Run the tests from a WebKit checkout.')
-  option_parser.add_option('--repeat', dest='repeat', type='int',
-                           default=2,
-                           help='Repeat count on test timeout.')
   option_parser.add_option('--exit_code', action='store_true',
                            help='If set, the exit code will be total number '
                            'of failures.')
   option_parser.add_option('--exe', action='store_true',
                            help='If set, use the exe test runner instead of '
                            'the APK.')
   option_parser.add_option('--abi', default='armeabi-v7a',
                            help='Platform of emulators to launch.')
 
 
@@ skipping 144 matching lines @@
     # The dexed JAR is fully qualified, assume the info JAR lives along side.
     options.uiautomator_jar = options.test_jar
   else:
     options.uiautomator_jar = os.path.join(
         _SDK_OUT_DIR, options.build_type, constants.SDK_BUILD_JAVALIB_DIR,
         '%s.dex.jar' % options.test_jar)
   options.uiautomator_info_jar = (
       options.uiautomator_jar[:options.uiautomator_jar.find('.dex.jar')] +
       '_java.jar')