test_runner.py Fix error message being intertwined with log messages

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 argparse
 import collections
@@ skipping 895 matching lines @@
           'Did not find device %s among attached device. Attached devices: %s'
           % (test_device, ', '.join(attached_devices)))
     return test_device
 
   else:
     if not attached_devices:
       raise device_errors.NoDevicesError()
     return sorted(attached_devices)
 
 
-def RunTestsCommand(args, parser): # pylint: disable=too-many-return-statements
+def RunTestsCommand(args): # pylint: disable=too-many-return-statements
   """Checks test type and dispatches to the appropriate function.
 
   Args:
     args: argparse.Namespace object.
-    parser: argparse.ArgumentParser object.
 
   Returns:
     Integer indicated exit code.
 
   Raises:
     Exception: Unknown command name passed in, or an exception from an
         individual test runner.
   """
   command = args.command
 
   ProcessCommonOptions(args)
 
   if args.enable_platform_mode:
-    return RunTestsInPlatformMode(args, parser)
+    return RunTestsInPlatformMode(args)
 
   forwarder.Forwarder.RemoveHostLog()
   if not ports.ResetTestServerPortAllocation():
     raise Exception('Failed to reset test server port.')
 
   def get_devices():
     return _GetAttachedDevices(args.blacklist_file, args.test_device,
                                args.enable_device_cache)
 
   if command == 'gtest':
-    return RunTestsInPlatformMode(args, parser)
+    return RunTestsInPlatformMode(args)
   elif command == 'linker':
     return _RunLinkerTests(args, get_devices())
   elif command == 'instrumentation':
     return _RunInstrumentationTests(args, get_devices())
   elif command == 'junit':
     return _RunJUnitTests(args)
   elif command == 'monkey':
     return _RunMonkeyTests(args, get_devices())
   elif command == 'perf':
     return _RunPerfTests(args, get_devices())
   elif command == 'python':
     return _RunPythonTests(args)
   else:
     raise Exception('Unknown test type.')
 
 
 _SUPPORTED_IN_PLATFORM_MODE = [
   # TODO(jbudorick): Add support for more test types.
   'gtest',
   'instrumentation',
   'uirobot',
 ]
 
 
-def RunTestsInPlatformMode(args, parser):
+def RunTestsInPlatformMode(args):
 
   def infra_error(message):
-    parser.exit(status=constants.INFRA_EXIT_CODE, message=message)
+    logging.fatal(message)
+    sys.exit(constants.INFRA_EXIT_CODE)
 
   if args.command not in _SUPPORTED_IN_PLATFORM_MODE:
     infra_error('%s is not yet supported in platform mode' % args.command)
 
   with environment_factory.CreateEnvironment(args, infra_error) as env:
     with test_instance_factory.CreateTestInstance(args, infra_error) as test:
       with test_run_factory.CreateTestRun(
           args, env, test, infra_error) as test_run:
         results = []
         repetitions = (xrange(args.repeat + 1) if args.repeat >= 0
@@ skipping 96 matching lines @@
 
   for test_type, config in sorted(VALID_COMMANDS.iteritems(),
                                   key=lambda x: x[0]):
     subparser = command_parsers.add_parser(
         test_type, usage='%(prog)s [options]', help=config.help_txt)
     config.add_options_func(subparser)
 
   args = parser.parse_args()
 
   try:
-    return RunTestsCommand(args, parser)
+    return RunTestsCommand(args)
   except base_error.BaseError as e:
     logging.exception('Error occurred.')
     if e.is_infra_error:
       return constants.INFRA_EXIT_CODE
     return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())