Add Instrumentation test support to remote device

build/android/pylib/remote/device/remote_device_instrumentation_run.py

+# Copyright 2014 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.
+
+"""Run specific test on specific environment."""
+
+import logging
+import os
+import tempfile
+
+from pylib.base import base_test_result
+
+from pylib.remote.device import remote_device_test_run
+from pylib.utils import apk_helper
+
+
+class RemoteDeviceInstrumentationRun(
+    remote_device_test_run.RemoteDeviceTestRun):
+  """Run instrumentation tests on a remote device."""
+
+  #override
+  def TestPackage(self):
+    return self._test_instance.test_package
+
+  #override
+  def _TriggerSetUp(self):
+    """Set up the triggering of a test run."""
+
+    logging.info('Triggering test run.')
+    runner_package = self._test_instance.test_runner

[jbudorick, 2015/01/16 22:24:48]

what's the point of doing this outside of the function call?

[rnephew (Wrong account), 2015/01/16 22:36:38]

I was originally doing other stuff, but got rid of it so this no longer makes
sense by itself. Moved.

+
+    self._AmInstrumentTestSetup(
+        self._test_instance._apk_under_test, self._test_instance.test_apk,
+        runner_package, environment_variables={})
+
+  #override
+  def _ParseTestResults(self):
+    logging.info('Parsing results from stdout.')
+    r = base_test_result.TestRunResults()
+
+    if self._results['results']['exception']:
+      r.AddResult(base_test_result.BaseTestResult(
+          self._results['results']['exception'],
+          base_test_result.ResultType.FAIL))
+      return r
+
+    _, errors, parsed_output = self._test_instance.ParseAmInstrumentRawOutput(
+        self._results['results']['output'].splitlines())
+    result = self._test_instance.GenerateMultiTestResult(errors, parsed_output)
+
+    if isinstance(result, base_test_result.BaseTestResult):
+      r.AddResult(result)
+    elif isinstance(result, list):
+      r.AddResults(result)
+    else:
+      raise Exception('Unexpected result type: %s' % type(result).__name__)
+
+    return r