Add Instrumentation test support to remote device

build/android/pylib/instrumentation/instrumentation_test_instance.py

 # Copyright 2015 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.
 
 import logging
 import os
 import pickle
 import sys
 
 from pylib import cmd_helper
@@ skipping 122 matching lines @@
         logging.error('Unrecognized status code %d. Handling as an error.',
                       status_code)
       result_type = base_test_result.ResultType.FAIL
       if 'stack' in bundle:
         log = '\n'.join(bundle['stack'])
 
   return test_result.InstrumentationTestResult(
       test_name, result_type, start_ms, duration_ms, log=log)
 
 
+def GenerateMultiTestResult(errors, statuses):

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

This implementation can just be in the test instance. The other two functions
are outside because they're still used in old code.

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

Done.

+  INSTR_STATUS_CODE_START = 1
+  results = []
+  skip_counter = 1
+  for status_code, bundle in statuses:
+    if status_code != INSTR_STATUS_CODE_START:
+    # TODO(rnephew): Make skipped tests still output test name. This is only

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

What's preventing you from doing this now?

Also, nit: this should be indented two more spaces.

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

I was planning on doing that in its own CL, as to not have large CLs touching
too many parts of the code. I also haven't started looking at how the tests
output when they run.

[jbudorick, 2015/01/16 22:39:06]

Fair enough.

+    # there to give skipped tests a unique name so they are counted
+      if 'test_skipped' in bundle:
+        test_name = "%s" % skip_counter

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

should just be

  test_name = str(skip_counter)

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

Done.

+        skip_counter += 1
+      else:
+        test_name = '%s#%s' % (
+            ''.join(bundle.get('class', [''])),
+            ''.join(bundle.get('test', [''])))
+
+      results.append(
+          GenerateTestResult(test_name, [(status_code, bundle)], 0, 0))
+
+  if len(errors) and errors.pop(0) == 'shortMsg=Native crash':

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

I'm not crazy about attempting to match an exact string here.

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

Either am I. But this and longMsg='long version of this crash message' are the
only ones I have seen. I can't make it more robust until I know what else will
return here. I will add a logging statement that outputs all the errors.

[jbudorick, 2015/01/16 22:39:06]

What if we just look for "Native crash" (maybe w/ case insensitivity)?

[rnephew (Wrong account), 2015/01/16 22:51:02]

Done.

+    results.append(
+        base_test_result.BaseTestResult(
+        'Crash detected', base_test_result.ResultType.CRASH))
+
+  return results
+
+
 class InstrumentationTestInstance(test_instance.TestInstance):
 
   def __init__(self, args, isolate_delegate, error_func):
     super(InstrumentationTestInstance, self).__init__()
 
     self._apk_under_test = None
     self._package_info = None
     self._test_apk = None
     self._test_jar = None
     self._test_package = None
@@ skipping 110 matching lines @@
     if hasattr(args, 'device_flags') and args.device_flags:
       with open(args.device_flags) as device_flags_file:
         stripped_lines = (l.strip() for l in device_flags_file)
         self._flags.extend([flag for flag in stripped_lines if flag])
     if hasattr(args, 'device_flags_file') and args.device_flags_file:
       with open(args.device_flags_file) as device_flags_file:
         stripped_lines = (l.strip() for l in device_flags_file)
         self._flags.extend([flag for flag in stripped_lines if flag])
 
   @property
+  def suite(self):
+    return 'instrumentation'
+
+  @property
   def apk_under_test(self):
     return self._apk_under_test
 
   @property
   def flags(self):
     return self._flags
 
   @property
   def package_info(self):
     return self._package_info
@@ skipping 173 matching lines @@
             'method': m['method'],
             'annotations': a,
         })
     return inflated_tests
 
   @staticmethod
   def ParseAmInstrumentRawOutput(raw_output):
     return ParseAmInstrumentRawOutput(raw_output)
 
   @staticmethod
+  def GenerateMultiTestResult(errors, statuses):
+    return GenerateMultiTestResult(errors, statuses)
+
+  @staticmethod
   def GenerateTestResult(test_name, instr_statuses, start_ms, duration_ms):
     return GenerateTestResult(test_name, instr_statuses, start_ms, duration_ms)
 
   #override
   def TearDown(self):
     if self._isolate_delegate:
       self._isolate_delegate.Clear()