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 re
 import sys
 
 from pylib import cmd_helper
 from pylib import constants
 from pylib import flag_changer
 from pylib.base import base_test_result
 from pylib.base import test_instance
 from pylib.instrumentation import test_result
 from pylib.utils import apk_helper
 from pylib.utils import md5sum
@@ skipping 245 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 168 matching lines @@
       for m in c['methods']:
         a = dict(c['annotations'])
         a.update(m['annotations'])
         inflated_tests.append({
             'class': c['class'],
             'method': m['method'],
             'annotations': a,
         })
     return inflated_tests
 
+  def GenerateMultiTestResult(self, errors, statuses):

[jbudorick, 2015/01/20 15:39:03]

Does this need |self|? It looks like it can be a @staticmethod.

[rnephew (Wrong account), 2015/01/20 16:45:46]

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
+        # there to give skipped tests a unique name so they are counted
+        if 'test_skipped' in bundle:
+          test_name = str(skip_counter)
+          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))
+    print 'batman'

[jbudorick, 2015/01/20 15:39:03]

the debugging statement we deserve, but not the one we need right now.

[rnephew (Wrong account), 2015/01/20 16:45:46]

Done.

+    for error in errors:
+      if re.search('Native Crash', error, re.IGNORECASE):
+        results.append(
+            base_test_result.BaseTestResult(
+            'Crash detected', base_test_result.ResultType.CRASH))
+
+    return results
+
   @staticmethod
   def ParseAmInstrumentRawOutput(raw_output):
     return ParseAmInstrumentRawOutput(raw_output)
 
   @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()