Updates the test runner script exit codes

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.
 
 TODO(gkanwar):
 * Add options to run Monkey tests.
@@ skipping 90 matching lines @@
                                  '(use --tool help to list them)'))
   option_parser.add_option('--flakiness-dashboard-server',
                            dest='flakiness_dashboard_server',
                            help=('Address of the server that is hosting the '
                                  'Chrome for Android flakiness dashboard.'))
   option_parser.add_option('--skip-deps-push', dest='push_deps',
                            action='store_false', default=True,
                            help=('Do not push dependencies to the device. '
                                  'Use this at own risk for speeding up test '
                                  'execution on local machine.'))
-  # TODO(gkanwar): This option is deprecated. Remove it in the future.
-  option_parser.add_option('--exit-code', action='store_true',
-                           help=('(DEPRECATED) If set, the exit code will be '
-                                 'total number of failures.'))
   # TODO(gkanwar): This option is deprecated. It is currently used to run tests
   # with the FlakyTest annotation to prevent the bots going red downstream. We
   # should instead use exit codes and let the Buildbot scripts deal with test
   # failures appropriately. See crbug.com/170477.
   option_parser.add_option('--buildbot-step-failure',

[frankf, 2013/07/03 21:26:37]

I think this is related to this CL, should we address it here?

[gkanwar, 2013/07/03 23:15:18]

I wasn't sure if we wanted to leave more time before removing it, but looking
through the source, it looks like there's no use of it in the buildbot scripts
(unless I'm missing something?), and the PrintStepResultIfNeeded function which
uses it isn't called anywhere either.

                            action='store_true',
                            help=('(DEPRECATED) If present, will set the '
                                  'buildbot status as STEP_FAILURE, otherwise '
                                  'as STEP_WARNINGS when test(s) fail.'))
   option_parser.add_option('-d', '--device', dest='test_device',
                            help=('Target device for the test suite '
                                  'to run on.'))
 
 
 def ProcessCommonOptions(options):
@@ skipping 238 matching lines @@
 
   Args:
     command: String indicating the command that was received to trigger
         this function.
     options: optparse options dictionary.
     args: List of extra args from optparse.
     option_parser: optparse.OptionParser object.
 
   Returns:
     Integer indicated exit code.
+
+  Raises:
+    Exception: Unknown command name passed in.
   """
 
   ProcessCommonOptions(options)
 
-  total_failed = 0
   if command == 'gtest':
     # TODO(gkanwar): See the emulator TODO above -- this call should either go
     # away or become generalized.
     ProcessEmulatorOptions(options)
-    total_failed = gtest_dispatch.Dispatch(options)
+    results = gtest_dispatch.Dispatch(options)
+    exit_code = results.exit_code
   elif command == 'content_browsertests':
-    total_failed = browsertests_dispatch.Dispatch(options)
+    results = browsertests_dispatch.Dispatch(options)
+    exit_code = results.exit_code
   elif command == 'instrumentation':
     ProcessInstrumentationOptions(options, option_parser.error)
     results = base_test_result.TestRunResults()
     if options.run_java_tests:
       results.AddTestRunResults(instrumentation_dispatch.Dispatch(options))
     if options.run_python_tests:
       results.AddTestRunResults(python_dispatch.DispatchPythonTests(options))
     report_results.LogFull(
         results=results,
         test_type='Instrumentation',
         test_package=os.path.basename(options.test_apk),
         annotation=options.annotations,
         build_type=options.build_type,
         flakiness_server=options.flakiness_dashboard_server)
-    total_failed += len(results.GetNotPass())
+    exit_code = results.exit_code
   elif command == 'uiautomator':
     ProcessUIAutomatorOptions(options, option_parser.error)
     results = base_test_result.TestRunResults()
     if options.run_java_tests:
       results.AddTestRunResults(uiautomator_dispatch.Dispatch(options))
     if options.run_python_tests:
       results.AddTestRunResults(python_dispatch.Dispatch(options))
     report_results.LogFull(
         results=results,
         test_type='UIAutomator',
         test_package=os.path.basename(options.test_jar),
         annotation=options.annotations,
         build_type=options.build_type,
         flakiness_server=options.flakiness_dashboard_server)
-    total_failed += len(results.GetNotPass())
+    exit_code = results.exit_code
   else:
     raise Exception('Unknown test type state')
 
-  return total_failed
+  return exit_code
 
 
 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.
     args: List of extra args from optparse.
@@ skipping 62 matching lines @@
   def get_command_list(self):
     if self.command_list:
       return '\nCommands:\n  %s\n' % '\n  '.join(sorted(self.command_list))
     return ''
 
   def get_example(self):
     if self.example:
       return '\nExample:\n  %s\n' % self.example
     return ''
 
+
 def main(argv):
   option_parser = CommandOptionParser(
       usage='Usage: %prog <command> [options]',
       command_list=VALID_COMMANDS.keys())
 
   if len(argv) < 2 or argv[1] not in VALID_COMMANDS:
     option_parser.print_help()
     return 0
   command = argv[1]
   VALID_COMMANDS[command].add_options_func(option_parser)
   options, args = option_parser.parse_args(argv)
   exit_code = VALID_COMMANDS[command].run_command_func(
       command, options, args, option_parser)
 
-  # Failures of individual test suites are communicated by printing a
-  # STEP_FAILURE message.
-  # Returning a success exit status also prevents the buildbot from incorrectly
-  # marking the last suite as failed if there were failures in other suites in
-  # the batch (this happens because the exit status is a sum of all failures
-  # from all suites, but the buildbot associates the exit status only with the
-  # most recent step).
   return exit_code
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))