[Android] Reland 'Keep track of unknown test results at the TestRunner layer.'

build/android/pylib/gtest/single_test_runner.py

 # Copyright (c) 2012 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 glob
 import logging
 import os
 import sys
 
 from pylib import android_commands
@@ skipping 229 matching lines @@
         os.path.join(
             self.adb.GetExternalStorage(),
             'third_party/WebKit/Source/WebKit/chromium/tests/data'))
 
   def RunTests(self):
     """Runs tests on a single device.
 
     Returns:
       A TestResults object.
     """
-    try:
-      self.test_package.CreateTestRunnerScript(self._gtest_filter,
-                                               self._test_arguments)
-      self.test_results = self.test_package.RunTestsAndListResults()
-    except errors.DeviceUnresponsiveError as e:
-      # Make sure this device is not attached
-      if android_commands.IsDeviceAttached(self.device):
-        raise e
-
-      # TODO(frankf): We should report these as "skipped" not "failures".
-      # Wrap the results
-      logging.warning(e)
-      failed_tests = []
-      for t in self._gtest_filter.split(':'):
-        failed_tests += [BaseTestResult(t, '')]
-      self.test_results = TestResults.FromRun(
-          failed=failed_tests, device_exception=self.device)
+    if self._gtest_filter:
+      try:
+        self.test_package.CreateTestRunnerScript(self._gtest_filter,
+                                                 self._test_arguments)
+        self.test_results = self.test_package.RunTestsAndListResults()
+      except errors.DeviceUnresponsiveError as e:
+        # Make sure this device is not attached
+        logging.warning(e)
+        if android_commands.IsDeviceAttached(self.device):
+          raise e
+        self.test_results.device_exception = device_exception
+      # Calculate unknown test results.
+      finally:
+        # TODO(frankf): Do not break TestResults encapsulation.
+        all_tests = set(self._gtest_filter.split(':'))
+        all_tests_ran = set([t.name for t in self.test_results.GetAll()])
+        unknown_tests = all_tests - all_tests_ran
+        self.test_results.unknown = [BaseTestResult(t, '') for t in
+                                     unknown_tests]
 
     return self.test_results
 
   def SetUp(self):
     """Sets up necessary test enviroment for the test suite."""
     super(SingleTestRunner, self).SetUp()
     self.adb.ClearApplicationState(constants.CHROME_PACKAGE)
     if self.dump_debug_info:
       self.dump_debug_info.StartRecordingLog(True)
     self.StripAndCopyFiles()
     self.LaunchHelperToolsForTestSuite()
     self.tool.SetupEnvironment()
 
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.tool.CleanUpEnvironment()
     if self.test_package.cleanup_test_files:
       self.adb.RemovePushedFiles()
     if self.dump_debug_info:
       self.dump_debug_info.StopRecordingLog()
     if self.dump_debug_info:
       self.dump_debug_info.ArchiveNewCrashFiles()
     super(SingleTestRunner, self).TearDown()