Convert runtest to have a built-in annotator.

scripts/common/gtest_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 re
 
 
 class GTestLogParser(object):
   """This helper class process GTest test output."""
 
   def __init__(self):
     # State tracking for log parsing
+    self.completed = False
     self._current_test = ''
     self._failure_description = []
     self._current_suppression_hash = ''
     self._current_suppression = []
     self._parsing_failures = False
 
     # Line number currently being processed.
     self._line_number = 0
 
     # List of parsing errors, as human-readable strings.
@@ skipping 13 matching lines @@
     # '%s disabled' or '%s flaky' on the waterfall display.
     self._disabled_tests = 0
     self._flaky_tests = 0
 
     # Regular expressions for parsing GTest logs. Test names look like
     #   SomeTestCase.SomeTest
     #   SomeName/SomeTestCase.SomeTest/1
     # This regexp also matches SomeName.SomeTest/1, which should be harmless.
     test_name_regexp = r'((\w+/)?\w+\.\w+(/\d+)?)'
 
+    self._master_name_re = re.compile('\[Running for master: "([^"]*)"')
+    self.master_name = ''
+
     self._test_name    = re.compile(test_name_regexp)
     self._test_start   = re.compile('\[\s+RUN\s+\] ' + test_name_regexp)
     self._test_ok      = re.compile('\[\s+OK\s+\] ' + test_name_regexp)
     self._test_fail    = re.compile('\[\s+FAILED\s+\] ' + test_name_regexp)
+    self._test_passed  = re.compile('\[\s+PASSED\s+\] \d+ tests?.')
     self._test_timeout = re.compile(
         'Test timeout \([0-9]+ ms\) exceeded for ' + test_name_regexp)
     self._disabled     = re.compile('  YOU HAVE (\d+) DISABLED TEST')
     self._flaky        = re.compile('  YOU HAVE (\d+) FLAKY TEST')
 
     self._suppression_start = re.compile(
         'Suppression \(error hash=#([0-9A-F]+)#\):')
     self._suppression_end   = re.compile('^}\s*$')
 
     self._retry_message = re.compile('RETRYING FAILED TESTS:')
     self.retrying_failed = False
 
+  def GetCurrentTest(self):
+    return self._current_test
+
   def _StatusOfTest(self, test):
     """Returns the status code for the given test, or 'not known'."""
     test_status = self._test_status.get(test, ('not known', []))
     return test_status[0]
 
   def _TestsByStatus(self, status, include_fails, include_flaky):
     """Returns list of tests with the given status.
 
     Args:
       include_fails: If False, tests containing 'FAILS_' anywhere in their
@@ skipping 78 matching lines @@
     """Returns list of suppression hashes found in the log."""
     return self._suppressions.keys()
 
   def Suppression(self, suppression_hash):
     """Returns a list containing the suppression for a given hash.
 
     If the suppression hash doesn't exist, returns [].
     """
     return self._suppressions.get(suppression_hash, [])
 
+  def CompletedWithoutFailure(self):
+    """Returns True if all tests completed and no tests failed unexpectedly."""
+

[cmp, 2012/06/28 19:14:16]

nit: remove empty line

+    if not self.completed:
+      return False
+
+    # don't count FAILS and FLAKY here
+    if self.FailedTests():
+      return False
+
+    return True

[cmp, 2012/06/28 19:14:16]

let's condense lines 172-179 to one line:
  return self.completed and not self.FailedTests()

+
   def ProcessLine(self, line):
     """This is called once with each line of the test log."""
 
     # Track line number for error messages.
     self._line_number += 1
 
     # Note: When sharding, the number of disabled and flaky tests will be read
     # multiple times, so this will only show the most recent values (but they
     # should all be the same anyway).
 
+    # Is it a line listing the master name?
+    if not self.master_name:
+      results = self._master_name_re.search(line)
+      if results:
+        self.master_name = results.group(1)
+
+    # Is it a line declaring all tests passed?
+    results =  self._test_passed.search(line)
+    if results:
+      self.completed = True
+      self._current_test = ''
+      return
+
     # Is it a line reporting disabled tests?
     results = self._disabled.search(line)
     if results:
       try:
         disabled = int(results.group(1))
       except ValueError:
         disabled = 0
       if disabled > 0 and isinstance(self._disabled_tests, int):
         self._disabled_tests = disabled
       else:
@@ skipping 122 matching lines @@
       if results:
         test_name = results.group(1)
         status = self._StatusOfTest(test_name)
         if status in ('not known', 'OK'):
           self._test_status[test_name] = (
               'failed', ['Unknown error, see stdio log.'])
       else:
         self._parsing_failures = False
     elif line.startswith('Failing tests:'):
       self._parsing_failures = True