[Android] Split uiautomator test runner from instrumentation.

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 116 matching lines @@
                            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.')
 
 
 def AddCommonInstrumentationOptions(option_parser):
   """Decorates OptionParser with base instrumentation tests options."""
 
   AddTestRunnerOptions(option_parser)
-  option_parser.add_option('-w', '--wait_debugger', dest='wait_for_debugger',
-                           action='store_true', help='Wait for debugger.')
   option_parser.add_option('-f', '--test_filter',
                            help='Test filter (if not fully qualified, '
                            'will run all matches).')
-  option_parser.add_option('-A', '--annotation', dest='annotation_str',
-                           help=('Run only tests with any of the given '
-                                 'annotations. '
-                                 'An annotation can be either a key or a '
-                                 'key-values pair. '
-                                 'A test that has no annotation is '
-                                 'considered "SmallTest".'))
+  option_parser.add_option(
+      '-A', '--annotation', dest='annotation_str',
+      help=('Comma-separated list of annotations. Run only tests with any of '
+            'the given annotations. An annotation can be either a key or a '
+            'key-values pair. A test that has no annotation is considered '
+            '"SmallTest".'))
   option_parser.add_option('-j', '--java_only', action='store_true',
                            help='Run only the Java tests.')
   option_parser.add_option('-p', '--python_only', action='store_true',
                            help='Run only the Python tests.')
-  option_parser.add_option('-n', '--run_count', type='int',
-                           dest='number_of_runs', default=1,
-                           help=('How many times to run each test, regardless '
-                                 'of the result. (Default is 1)'))
   option_parser.add_option('--screenshot', dest='screenshot_failures',
                            action='store_true',
                            help='Capture screenshots of test failures')
   option_parser.add_option('--save-perf-json', action='store_true',
                            help='Saves the JSON file for each UI Perf test.')
   option_parser.add_option('--shard_retries', type=int, default=1,
                            help=('Number of times to retry each failure when '
                                  'sharding.'))
   option_parser.add_option('--official-build', help='Run official build tests.')
   option_parser.add_option('--device',
@@ skipping 20 matching lines @@
                                  'should be of the form <target>:<source>, '
                                  '<target> is relative to the device data'
                                  'directory, and <source> is relative to the '
                                  'chromium build directory.'))
 
 
 def AddInstrumentationOptions(option_parser):
   """Decorates OptionParser with instrumentation tests options."""
 
   AddCommonInstrumentationOptions(option_parser)
+  option_parser.add_option('-w', '--wait_debugger', dest='wait_for_debugger',
+                           action='store_true', help='Wait for debugger.')
   option_parser.add_option('-I', dest='install_apk',
                            help='Install APK.', action='store_true')
   option_parser.add_option(
       '--test-apk', dest='test_apk',
       help=('The name of the apk containing the tests (without the .apk '
             'extension; e.g. "ContentShellTest"). Alternatively, this can '
             'be a full path to the apk.'))
 
 
 def AddUIAutomatorOptions(option_parser):
@@ skipping 20 matching lines @@
     option_parser.error('Options java_only (-j) and python_only (-p) '
                         'are mutually exclusive.')
   options.run_java_tests = True
   options.run_python_tests = True
   if options.java_only:
     options.run_python_tests = False
   elif options.python_only:
     options.run_java_tests = False
 
   if options.annotation_str:
-    options.annotation = options.annotation_str.split()
+    options.annotations = options.annotation_str.split(',')
   elif options.test_filter:
-    options.annotation = []
+    options.annotations = []
   else:
-    options.annotation = ['Smoke', 'SmallTest', 'MediumTest', 'LargeTest']
+    options.annotations = ['Smoke', 'SmallTest', 'MediumTest', 'LargeTest']
 
 
 def ValidateInstrumentationOptions(option_parser, options, args):
   """Validate options/arguments and populate options with defaults."""
   ValidateCommonInstrumentationOptions(option_parser, options, args)
 
   if not options.test_apk:
     option_parser.error('--test-apk must be specified.')
 
   if os.path.exists(options.test_apk):
@@ skipping 25 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')