[Android] Fix handling of intentional crashes during death tests.

build/android/pylib/gtest/gtest_test_instance.py

Index: build/android/pylib/gtest/gtest_test_instance.py
diff --git a/build/android/pylib/gtest/gtest_test_instance.py b/build/android/pylib/gtest/gtest_test_instance.py
index f283c5bba1ab04ab589c47ab019a39a31c44cf84..0a01525efdf216f98227c763fc8800071f479503 100644
--- a/build/android/pylib/gtest/gtest_test_instance.py
+++ b/build/android/pylib/gtest/gtest_test_instance.py
@@ -90,8 +90,6 @@ _EXTRA_SHARD_SIZE_LIMIT = (
 _RE_TEST_STATUS = re.compile(
     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')
@@ -139,6 +137,8 @@ def ParseGTestOutput(output):
   Returns:
     A list of base_test_result.BaseTestResults.
   """
+  duration = 0
+  fallback_result_type = None
   log = []
   result_type = None
   results = []
@@ -147,8 +147,9 @@ def ParseGTestOutput(output):
   def handle_possibly_unknown_test():

[mikecase (-- gone --), 2016/07/11 21:15:04]

I'm kinda confused on what this CL is doing. Why is fallback_result_type
necessary?

[jbudorick, 2016/07/11 21:29:36]

This CL essentially switches from treating [ +CRASHED +] as a terminating test
log message to a nonterminating one because it may not be the end of the test. I
didn't realize that when I initially wrote this.

In death tests in particular, you can see something like this:

  [ RUN ] FooTest.Bar
  [ CRASHED         ]
  [ OK ] FooTest.Bar

This looks weird but is WAI and should be treated as a success because:
 - we install a signal handler in native_test_launcher.cc that prints CRASHED on
receiving any one of several signals
 - EXPECT_DEATH forks the process
 - the child inherits the parent's signal handlers and logs [ CRASHED ] when it
crashes
 - the parent sees that the child died and the EXPECT_DEATH assertion passes

If [ CRASHED ] actually _is_ the last thing we see from a test,
fallback_result_type ensures that we report that test as CRASH rather than
UNKNOWN.

     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 '')))
+          test_name,
+          fallback_result_type or base_test_result.ResultType.UNKNOWN,
+          duration, log=('\n'.join(log) if log else '')))
 
   for l in output:
     logging.info(l)
@@ -156,13 +157,16 @@ def ParseGTestOutput(output):
     if matcher:
       if matcher.group(1) == 'RUN':
         handle_possibly_unknown_test()
+        duration = 0
+        fallback_result_type = None

[mikecase (-- gone --), 2016/07/11 21:15:04]

Do you want to set these two things before calling
handle_possibly_unknown_tests() (called on the line before this?)

[rnephew (Reviews Here), 2016/07/11 21:23:54]

Thats for the step before it in the for loop.

[jbudorick, 2016/07/11 21:29:35]

No. They, like test_name, are carried over from before in the event that a test
terminated in an unexpectedly silent fashion.

         log = []
+        result_type = None
       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
+        fallback_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
@@ -182,8 +186,6 @@ def ParseGTestOutput(output):
       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()