Revert of Enable presubmit pylint in build/android.

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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 all types of tests from one unified interface."""
 
 import collections
 import logging
 import optparse
 import os
 import shutil
 import signal
 import sys
 import threading
+import traceback
 
 from pylib import android_commands
 from pylib import constants
 from pylib import forwarder
 from pylib import ports
 from pylib.base import base_test_result
 from pylib.base import test_dispatcher
 from pylib.gtest import gtest_config
 from pylib.gtest import setup as gtest_setup
 from pylib.gtest import test_options as gtest_test_options
@@ skipping 152 matching lines @@
   option_parser.add_option('--test_data', action='append', default=[],
                            help=('Each instance defines a directory of test '
                                  'data that should be copied to the target(s) '
                                  'before running the tests. The argument '
                                  '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 ProcessJavaTestOptions(options):
+def ProcessJavaTestOptions(options, error_func):
   """Processes options/arguments and populates |options| with defaults."""
 
   if options.annotation_str:
     options.annotations = options.annotation_str.split(',')
   elif options.test_filter:
     options.annotations = []
   else:
     options.annotations = ['Smoke', 'SmallTest', 'MediumTest', 'LargeTest',
                            'EnormousTest']
 
@@ skipping 38 matching lines @@
 
   Args:
     options: optparse.Options object.
     error_func: Function to call with the error message in case of an error.
 
   Returns:
     An InstrumentationOptions named tuple which contains all options relevant to
     instrumentation tests.
   """
 
-  ProcessJavaTestOptions(options)
+  ProcessJavaTestOptions(options, error_func)
 
   if options.java_only and options.python_only:
     error_func('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
@@ skipping 57 matching lines @@
 
   Args:
     options: optparse.Options object.
     error_func: Function to call with the error message in case of an error.
 
   Returns:
     A UIAutomatorOptions named tuple which contains all options relevant to
     uiautomator tests.
   """
 
-  ProcessJavaTestOptions(options)
+  ProcessJavaTestOptions(options, error_func)
 
   if not options.package:
     error_func('--package is required.')
 
   if options.package not in constants.PACKAGE_INFO:
     error_func('Invalid package.')
 
   if not options.test_jar:
     error_func('--test-jar must be specified.')
 
@@ skipping 145 matching lines @@
     error_func('Please specify one of: --steps, --print-step, --single-step.')
   single_step = None
   if options.single_step:
     single_step = ' '.join(args[2:])
   return perf_test_options.PerfOptions(
       options.steps, options.flaky_steps, options.print_step,
       options.no_timeout, options.test_filter, options.dry_run,
       single_step)
 
 
-def _RunGTests(options, devices):
+def _RunGTests(options, error_func, devices):
   """Subcommand of RunTestsCommands which runs gtests."""
   ProcessGTestOptions(options)
 
   exit_code = 0
   for suite_name in options.suite_name:
     # TODO(gkanwar): Move this into ProcessGTestOptions once we require -s for
     # the gtest command.
     gtest_options = gtest_test_options.GTestOptions(
         options.tool,
         options.cleanup_test_files,
@@ skipping 17 matching lines @@
         test_type='Unit test',
         test_package=suite_name,
         flakiness_server=options.flakiness_dashboard_server)
 
   if os.path.isdir(constants.ISOLATE_DEPS_DIR):
     shutil.rmtree(constants.ISOLATE_DEPS_DIR)
 
   return exit_code
 
 
-def _RunLinkerTests(options, devices):
+def _RunLinkerTests(options, error_func, devices):
   """Subcommand of RunTestsCommands which runs linker tests."""
   runner_factory, tests = linker_setup.Setup(options, devices)
 
   results, exit_code = test_dispatcher.RunTests(
       tests, runner_factory, devices, shard=True, test_timeout=60,
       num_retries=options.num_retries)
 
   report_results.LogFull(
       results=results,
       test_type='Linker test',
@@ skipping 165 matching lines @@
 
   ProcessCommonOptions(options)
 
   devices = _GetAttachedDevices(options.test_device)
 
   forwarder.Forwarder.RemoveHostLog()
   if not ports.ResetTestServerPortAllocation():
     raise Exception('Failed to reset test server port.')
 
   if command == 'gtest':
-    return _RunGTests(options, devices)
+    return _RunGTests(options, option_parser.error, devices)
   elif command == 'linker':
-    return _RunLinkerTests(options, devices)
+    return _RunLinkerTests(options, option_parser.error, devices)
   elif command == 'instrumentation':
     return _RunInstrumentationTests(options, option_parser.error, devices)
   elif command == 'uiautomator':
     return _RunUIAutomatorTests(options, option_parser.error, devices)
   elif command == 'monkey':
     return _RunMonkeyTests(options, option_parser.error, devices)
   elif command == 'perf':
     return _RunPerfTests(options, args, option_parser.error, devices)
   else:
     raise Exception('Unknown test type.')
 
 
-def HelpCommand(command, _options, args, option_parser):
+def HelpCommand(command, options, args, option_parser):
   """Display help for a certain command, or overall help.
 
   Args:
     command: String indicating the command that was received to trigger
         this function.
-    options: optparse options dictionary. unused.
+    options: optparse options dictionary.
     args: List of extra args from optparse.
     option_parser: optparse.OptionParser object.
 
   Returns:
     Integer indicated exit code.
   """
   # If we don't have any args, display overall help
   if len(args) < 3:
     option_parser.print_help()
     return 0
@@ skipping 35 matching lines @@
     'monkey': CommandFunctionTuple(
         AddMonkeyTestOptions, RunTestsCommand),
     'perf': CommandFunctionTuple(
         AddPerfTestOptions, RunTestsCommand),
     'linker': CommandFunctionTuple(
         AddLinkerTestOptions, RunTestsCommand),
     'help': CommandFunctionTuple(lambda option_parser: None, HelpCommand)
     }
 
 
-def DumpThreadStacks(_signal, _frame):
+def DumpThreadStacks(signal, frame):
   for thread in threading.enumerate():
     reraiser_thread.LogThreadStack(thread)
 
 
-def main():
+def main(argv):
   signal.signal(signal.SIGUSR1, DumpThreadStacks)
   option_parser = command_option_parser.CommandOptionParser(
       commands_dict=VALID_COMMANDS)
   return command_option_parser.ParseAndExecute(option_parser)
 
 
 if __name__ == '__main__':
-  sys.exit(main())
+  sys.exit(main(sys.argv))