Add AMP support to test runner.

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
@@ skipping 98 matching lines @@
     constants.SetAdbPath(options.adb_path)
   # Some things such as Forwarder require ADB to be in the environment path.
   adb_dir = os.path.dirname(constants.GetAdbPath())
   if adb_dir and adb_dir not in os.environ['PATH'].split(os.pathsep):
     os.environ['PATH'] = adb_dir + os.pathsep + os.environ['PATH']
   if options.environment not in constants.VALID_ENVIRONMENTS:
     error_func('--environment must be one of: %s' %
                ', '.join(constants.VALID_ENVIRONMENTS))
 
 
+def AddRemoteDeviceOptions(option_parser):
+  group = optparse.OptionGroup(option_parser, 'Remote Device Options')
+  group.add_option('--remote-device', default='Nexus 5', type='string',
+                   help=('Device type to run test on.'))
+  group.add_option('--remote-device-os', default='4.4.2', type='string',
+                   help=('OS to have on the device.'))
+  group.add_option('--api-key', default='', type='string',
+                   help=('API key for remote devices.'))
+  group.add_option('--api-secret', default='', type='string',
+                   help=('API secret for remote devices.'))
+  group.add_option('--results-path', default='', type='string',
+                   help=('File path to download results to.'))
+  option_parser.add_option_group(group)
+
+
 def AddDeviceOptions(option_parser):
   group = optparse.OptionGroup(option_parser, 'Device Options')
   group.add_option('-c', dest='cleanup_test_files',
                    help='Cleanup test files on the device after run',
                    action='store_true')
   group.add_option('--tool',
                    dest='tool',
                    help=('Run the test under a tool '
                          '(use --tool help to list them)'))
   group.add_option('-d', '--device', dest='test_device',
@@ skipping 28 matching lines @@
                            type='int',
                            default=60)
   option_parser.add_option('--isolate_file_path',
                            '--isolate-file-path',
                            dest='isolate_file_path',
                            help='.isolate file path to override the default '
                                 'path')
   # TODO(gkanwar): Move these to Common Options once we have the plumbing
   # in our other test types to handle these commands
   AddCommonOptions(option_parser)
   AddDeviceOptions(option_parser)

[jbudorick, 2014/11/21 00:17:26]

I'm working on results now, but options are next.

+  AddRemoteDeviceOptions(option_parser)
 
 
 def AddLinkerTestOptions(option_parser):
   option_parser.usage = '%prog linker'
   option_parser.commands_dict = {}
   option_parser.example = '%prog linker'
 
   option_parser.add_option('-f', '--gtest-filter', dest='test_filter',
                            help='googletest-style filter string.')
   AddCommonOptions(option_parser)
@@ skipping 335 matching lines @@
   return monkey_test_options.MonkeyOptions(
       options.verbose_count,
       options.package,
       options.event_count,
       category,
       options.throttle,
       options.seed,
       options.extra_args)
 
 
+def AddUirobotTestOptions(option_parser):
+  """Adds uirobot test options to |option_parser|."""
+
+  option_parser.usage = '%prog uirobot [options]'
+  option_parser.commands_dict = {}
+  option_parser.example = (
+      '%prog monkey --minutes=1')
+
+  option_parser.add_option(
+      '--minutes', default=5, type='string',
+      help='Number of minutes to run uirobot test [default: %default].')
+
+  AddCommonOptions(option_parser)
+  AddDeviceOptions(option_parser)
+  AddRemoteDeviceOptions(option_parser)
+
 def AddPerfTestOptions(option_parser):
   """Adds perf test options to |option_parser|."""
 
   option_parser.usage = '%prog perf [options]'
   option_parser.commands_dict = {}
   option_parser.example = ('%prog perf '
                            '[--single-step -- command args] or '
                            '[--steps perf_steps.json] or '
                            '[--print-step step]')
 
@@ skipping 362 matching lines @@
   elif command == 'perf':
     return _RunPerfTests(options, args, option_parser.error)
   elif command == 'python':
     return _RunPythonTests(options, option_parser.error)
   else:
     raise Exception('Unknown test type.')
 
 
 _SUPPORTED_IN_PLATFORM_MODE = [
   # TODO(jbudorick): Add support for more test types.
-  'gtest',
+  'gtest','uirobot',

[jbudorick, 2014/11/21 00:17:26]

nit: space after the first comma

[rnephew (Reviews Here), 2014/11/21 18:26:48]

Done.

 ]
 
 
 def RunTestsInPlatformMode(command, options, option_parser):
 
   if command not in _SUPPORTED_IN_PLATFORM_MODE:
     option_parser.error('%s is not yet supported in platform mode' % command)
 
   with environment_factory.CreateEnvironment(
       command, options, option_parser.error) as env:
     with test_instance_factory.CreateTestInstance(
         command, options, option_parser.error) as test:
       with test_run_factory.CreateTestRun(
           options, env, test, option_parser.error) as test_run:
-        results = test_run.RunTests()
+        results = test_run.RunTest()
+
+        if options.environment == 'remote_device':

[jbudorick, 2014/11/21 00:17:26]

wip on my end

+          print results
+          return
 
         report_results.LogFull(
             results=results,
             test_type=test.TestType(),
             test_package=test_run.TestPackage(),
             annotation=options.annotations,
             flakiness_server=options.flakiness_dashboard_server)
 
   return results
 
@@ skipping 53 matching lines @@
     'junit': CommandFunctionTuple(
         AddJUnitTestOptions, RunTestsCommand),
     'monkey': CommandFunctionTuple(
         AddMonkeyTestOptions, RunTestsCommand),
     'perf': CommandFunctionTuple(
         AddPerfTestOptions, RunTestsCommand),
     'python': CommandFunctionTuple(
         AddPythonTestOptions, RunTestsCommand),
     'linker': CommandFunctionTuple(
         AddLinkerTestOptions, RunTestsCommand),
+    'uirobot': CommandFunctionTuple(
+        AddUirobotTestOptions, RunTestsCommand),
     'help': CommandFunctionTuple(lambda option_parser: None, HelpCommand)
     }
 
 
 def DumpThreadStacks(_signal, _frame):
   for thread in threading.enumerate():
     reraiser_thread.LogThreadStack(thread)
 
 
 def main():
   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())