Upstream changes to python tests.

build/android/pylib/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."""
 
 import constants
 import optparse
 import os
 
 _SDK_OUT_DIR = os.path.join(constants.CHROME_DIR, 'out')
 
 
 def AddBuildTypeOption(option_parser):
+  """Decorates OptionParser with build type option."""
   default_build_type = 'Debug'
   if 'BUILDTYPE' in os.environ:
     default_build_type = os.environ['BUILDTYPE']
   option_parser.add_option('--debug', action='store_const', const='Debug',
                            dest='build_type', default=default_build_type,
                            help='If set, run test suites under out/Debug. '
                                 'Default is env var BUILDTYPE or Debug')
   option_parser.add_option('--release', action='store_const', const='Release',
                            dest='build_type',
                            help='If set, run test suites under out/Release. '
                                 'Default is env var BUILDTYPE or Debug.')
 
 
-def CreateTestRunnerOptionParser(usage=None, default_timeout=60):
-  """Returns a new OptionParser with arguments applicable to all tests."""
-  option_parser = optparse.OptionParser(usage=usage)
+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('-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,
                            help='Profiling tool to run during test. '
                            'Pass multiple times to run multiple profilers. '
                            'Available profilers: %s' % profilers)
   option_parser.add_option('--tool',
                            dest='tool',
                            help='Run the test under a tool '
                            '(use --tool help to list them)')
   AddBuildTypeOption(option_parser)
-  return option_parser
 
 
-def ParseInstrumentationArgs(args):
-  """Parse arguments and return options with defaults."""
+def AddInstrumentationOptions(option_parser):
+  """Decorates OptionParser with instrumentation tests options."""
 
-  option_parser = CreateTestRunnerOptionParser()
+  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('-I', dest='install_apk', help='Install APK.',
                            action='store_true')
   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. '
@@ skipping 22 matching lines @@
                            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',
                            help='Serial number of device we should use.')
   option_parser.add_option('--python_test_root',
                            help='Root of the python-driven tests.')
 
-  options, args = option_parser.parse_args(args)
+def ValidateInstrumentationOptions(options, args):
+  """Validate options/arguments and populate options with defaults."""
   if len(args) > 1:
     option_parser.error('Unknown argument:', args[1:])
   if options.java_only and options.python_only:
     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
 
   options.test_apk_path = os.path.join(_SDK_OUT_DIR,
                                        options.build_type,
                                        '%s.apk' % options.test_apk)
   options.test_apk_jar_path = os.path.join(_SDK_OUT_DIR,
                                            options.build_type,
                                            '%s.jar'
                                            % options.test_apk)
   if options.annotation_str:
     options.annotation = options.annotation_str.split()
   elif options.test_filter:
     options.annotation = []
   else:
     options.annotation = ['Smoke', 'SmallTest', 'MediumTest', 'LargeTest']
 
-  return options