Convert runtest to have a built-in annotator.

scripts/slave/gtest_slave_utils.py

 #!/usr/bin/env python
 # 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 logging
 import os
-import re
 import sys
 
 from xml.dom import minidom
 from slave.gtest.json_results_generator import JSONResultsGenerator
 from slave.gtest.test_result import TestResult
 from slave.gtest.test_result import canonical_name
 
 
 GENERATE_JSON_RESULTS_OPTIONS = [
     'builder_name', 'build_name', 'build_number', 'results_directory',
     'builder_base_url', 'webkit_dir', 'chrome_dir', 'test_results_server',
     'test_type', 'master_name']
 
 INCREMENTAL_RESULTS_FILENAME = "incremental_results.json"
 TIMES_MS_FILENAME = "times_ms.json"
 
 
-class GTestUnexpectedDeathTracker(object):
-  """A lightweight version of log parser that keeps track of running tests
-  for unexpected timeout or crash."""
+def GetResultsMap(observer):
+  """Returns a map of TestResults.  Returns an empty map if no current test
+  has been recorded."""
 
-  def __init__(self):
-    self._current_test = None
-    self._completed = False
-    self._test_start   = re.compile('\[\s+RUN\s+\] (\w+\.\w+)')
-    self._test_ok      = re.compile('\[\s+OK\s+\] (\w+\.\w+)')
-    self._test_fail    = re.compile('\[\s+FAILED\s+\] (\w+\.\w+)')
-    self._test_passed = re.compile('\[\s+PASSED\s+\] \d+ tests?.')
+  if not observer.GetCurrentTest():
+    return dict()
 
-    self._failed_tests = set()
+  test_results_map = dict()
+  for test in observer.FailedTests(include_fails=True, include_flaky=True):
+    test_results_map[canonical_name(test)] = TestResult(test, failed=True)
 
-  def OnReceiveLine(self, line):
-    results = self._test_start.search(line)
-    if results:
-      self._current_test = results.group(1)
-      return
-
-    results = self._test_ok.search(line)
-    if results:
-      self._current_test = ''
-      return
-
-    results = self._test_fail.search(line)
-    if results:
-      self._failed_tests.add(results.group(1))
-      self._current_test = ''
-      return
-
-    results = self._test_passed.search(line)
-    if results:
-      self._completed = True
-      self._current_test = ''
-      return
-
-  def GetResultsMap(self):
-    """Returns a map of TestResults.  Returns an empty map if no current test
-    has been recorded."""
-
-    if not self._current_test:
-      return dict()
-
-    self._failed_tests.add(self._current_test)
-
-    test_results_map = dict()
-    for test in self._failed_tests:
-      test_results_map[canonical_name(test)] = TestResult(test, failed=True)
-
-    return test_results_map
-
-  def CompletedWithoutFailure(self):
-    """Returns True if all tests completed and no tests failed unexpectedly."""
-
-    if not self._completed:
-      return False
-
-    for test in self._failed_tests:
-      test_modifier = TestResult(test, failed=True).modifier
-      if test_modifier not in (TestResult.FAILS, TestResult.FLAKY):
-        return False
-
-    return True
-
+  return test_results_map
 
 def GetResultsMapFromXML(results_xml):
   """Parse the given results XML file and returns a map of TestResults."""
 
   results_xml_file = None
   try:
     results_xml_file = open(results_xml)
   except IOError:
     logging.error("Cannot open file %s", results_xml)
     return dict()
@@ skipping 142 matching lines @@
 
   if not options.chrome_dir:
     options.chrome_dir = os.path.join(options.webkit_dir, "WebKit", "chromium")
 
   results_map = GetResultsMapFromXML(options.input_results_xml)
   GenerateAndUploadJSONResults(results_map, options)
 
 
 if '__main__' == __name__:
   main()