[Android] Fix unknown handling in gtest_test_instance.

build/android/pylib/gtest/gtest_test_instance.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.
 
 import logging
 import os
 import re
 import tempfile
 
 from devil.android import apk_helper
@@ skipping 80 matching lines @@
     r'\[ +((?:RUN)|(?:FAILED)|(?:OK)|(?:CRASHED)) +\]'
     r' ?([^ ]+)?(?: \((\d+) ms\))?$')
 _RE_TEST_RUN_STATUS = re.compile(
     r'\[ +(PASSED|RUNNER_FAILED|CRASHED) \] ?[^ ]+')
 # Crash detection constants.
 _RE_TEST_ERROR = re.compile(r'FAILURES!!! Tests run: \d+,'
                                     r' Failures: \d+, Errors: 1')
 _RE_TEST_CURRENTLY_RUNNING = re.compile(r'\[ERROR:.*?\]'
                                     r' Currently running: (.*)')
 
-# TODO(jbudorick): Make this a class method of GtestTestInstance once
-# test_package_apk and test_package_exe are gone.
 def ParseGTestListTests(raw_list):
   """Parses a raw test list as provided by --gtest_list_tests.
 
   Args:
     raw_list: The raw test listing with the following format:
 
     IPCChannelTest.
       SendMessageInChannelConnected
     IPCSyncChannelTest.
       Simple
@@ skipping 13 matching lines @@
     if test[0] != ' ':
       test_case = test.split()[0]
       if test_case.endswith('.'):
         current = test_case
     elif not 'YOU HAVE' in test:
       test_name = test.split()[0]
       ret += [current + test_name]
   return ret
 
 
+def ParseGTestOutput(output):
+  """Parses raw gtest output and returns a list of results.
+
+  Args:
+    output: A list of output lines.
+  Returns:
+    A list of base_test_result.BaseTestResults.
+  """
+  log = []
+  result_type = None
+  results = []
+  test_name = None
+
+  def handle_possibly_unknown_test():
+    if test_name is not None:
+      results.append(base_test_result.BaseTestResult(
+          test_name, base_test_result.ResultType.UNKNOWN, 0,
+          log=('\n'.join(log) if log else '')))
+
+  for l in output:
+    logging.info(l)
+    matcher = _RE_TEST_STATUS.match(l)
+    if matcher:
+      if matcher.group(1) == 'RUN':
+        handle_possibly_unknown_test()
+        log = []
+      elif matcher.group(1) == 'OK':
+        result_type = base_test_result.ResultType.PASS
+      elif matcher.group(1) == 'FAILED':
+        result_type = base_test_result.ResultType.FAIL
+      elif matcher.group(1) == 'CRASHED':
+        result_type = base_test_result.ResultType.CRASH
+      # Be aware that test name and status might not appear on same line.
+      test_name = matcher.group(2) if matcher.group(2) else test_name
+      duration = int(matcher.group(3)) if matcher.group(3) else 0
+
+    else:
+      # Needs another matcher here to match crashes, like those of DCHECK.
+      matcher = _RE_TEST_CURRENTLY_RUNNING.match(l)
+      if matcher:
+        test_name = matcher.group(1)
+        result_type = base_test_result.ResultType.CRASH
+        duration = 0 # Don't know.
+
+    if log is not None:
+      log.append(l)
+
+    if result_type:
+      results.append(base_test_result.BaseTestResult(
+          test_name, result_type, duration,
+          log=('\n'.join(log) if log else '')))
+      log = None
+      result_type = None
+      test_name = None
+
+  handle_possibly_unknown_test()
+
+  return results
+
+
 class GtestTestInstance(test_instance.TestInstance):
 
   def __init__(self, args, isolate_delegate, error_func):
     super(GtestTestInstance, self).__init__()
     # TODO(jbudorick): Support multiple test suites.
     if len(args.suite_name) > 1:
       raise ValueError('Platform mode currently supports only 1 gtest suite')
     self._extract_test_list_from_filter = args.extract_test_list_from_filter
     self._shard_timeout = args.shard_timeout
     self._suite = args.suite_name[0]
@@ skipping 198 matching lines @@
         host_paths.DIR_SOURCE_ROOT, 'build', 'android', 'pylib', 'gtest',
         'filter', '%s_disabled' % self._suite)
     if disabled_tests_file_path and os.path.exists(disabled_tests_file_path):
       with open(disabled_tests_file_path) as disabled_tests_file:
         disabled_filter_items += [
             '%s' % l for l in (line.strip() for line in disabled_tests_file)
             if l and not l.startswith('#')]
 
     return '*-%s' % ':'.join(disabled_filter_items)
 
-  # pylint: disable=no-self-use
-  def ParseGTestOutput(self, output):
-    """Parses raw gtest output and returns a list of results.
-
-    Args:
-      output: A list of output lines.
-    Returns:
-      A list of base_test_result.BaseTestResults.
-    """
-    log = []
-    result_type = None
-    results = []
-    test_name = None
-    for l in output:
-      logging.info(l)
-      matcher = _RE_TEST_STATUS.match(l)
-      if matcher:
-        # Be aware that test name and status might not appear on same line.
-        test_name = matcher.group(2) if matcher.group(2) else test_name
-        duration = int(matcher.group(3)) if matcher.group(3) else 0
-        if matcher.group(1) == 'RUN':
-          log = []
-        elif matcher.group(1) == 'OK':
-          result_type = base_test_result.ResultType.PASS
-        elif matcher.group(1) == 'FAILED':
-          result_type = base_test_result.ResultType.FAIL
-        elif matcher.group(1) == 'CRASHED':
-          result_type = base_test_result.ResultType.CRASH
-
-      # Needs another matcher here to match crashes, like those of DCHECK.
-      matcher = _RE_TEST_CURRENTLY_RUNNING.match(l)
-      if matcher:
-        test_name = matcher.group(1)
-        result_type = base_test_result.ResultType.CRASH
-        duration = 0 # Don't know.
-
-      if log is not None:
-        log.append(l)
-
-      if result_type:
-        results.append(base_test_result.BaseTestResult(
-            test_name, result_type, duration,
-            log=('\n'.join(log) if log else '')))
-        log = None
-        result_type = None
-
-    return results
-
   #override
   def TearDown(self):
     """Clear the mappings created by SetUp."""
     if self._isolate_delegate:
       self._isolate_delegate.Clear()