Update GTest Parsing Code

scripts/common/unittests/gtest_utils_test.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.
 
 """Unit tests for classes in gtest_command.py."""
 
 import unittest
 
 import test_env  # pylint: disable=W0611
 
 from common import gtest_utils
 
 
 FAILURES = ['NavigationControllerTest.Reload',
             'NavigationControllerTest/SpdyNetworkTransTest.Constructor/0',
             'BadTest.TimesOut',
             'MoreBadTest.TimesOutAndFails',
-            'SomeOtherTest.SwitchTypes']
+            'SomeOtherTest.SwitchTypes',
+            'SomeOtherTest.FAILS_ThisTestTimesOut']
 
 FAILS_FAILURES = ['SomeOtherTest.FAILS_Bar']
 FLAKY_FAILURES = ['SomeOtherTest.FLAKY_Baz']
 
 TIMEOUT_MESSAGE = 'Killed (timed out).'
 
 RELOAD_ERRORS = ('C:\b\slave\chrome-release-snappy\build\chrome\browser'
 '\navigation_controller_unittest.cc:381: Failure' + """
 Value of: -1
 Expected: contents->controller()->GetPendingEntryIndex()
@@ skipping 78 matching lines @@
 [ RUN      ] MoreBadTest.TimesOutAndFails
 %(morebad_errors)s
 """ % {'morebad_errors': MOREBAD_ERRORS} +
 '[0531/042642:ERROR:/b/slave/chromium-rel-mac-builder/build/src/chrome/test'
 '/test_launcher/out_of_proc_test_runner.cc(79)] Test timeout (30000 ms) '
 'exceeded for MoreBadTest.TimesOutAndFails' + """
 Handling SIGTERM.
 Successfully wrote to shutdown pipe, resetting signal handler.
 [  FAILED  ] MoreBadTest.TimesOutAndFails (31000 ms)
 
-[----------] 4 tests from SomeOtherTest
+[----------] 5 tests from SomeOtherTest
 [ RUN      ] SomeOtherTest.SwitchTypes
 %(switch_errors)s
 [  FAILED  ] SomeOtherTest.SwitchTypes (40 ms)
 [ RUN      ] SomeOtherTest.Foo
 [       OK ] SomeOtherTest.Foo (20 ms)
 [ RUN      ] SomeOtherTest.FAILS_Bar
 Some error message for a failing test.
 [  FAILED  ] SomeOtherTest.FAILS_Bar (40 ms)
+[ RUN      ] SomeOtherTest.FAILS_ThisTestTimesOut
+""" %  {'switch_errors' : SWITCH_ERRORS} +
+'[0521/041343:ERROR:test_launcher.cc(384)] Test timeout (5000 ms) '
+'exceeded for SomeOtherTest.FAILS_ThisTestTimesOut' + """
 [ RUN      ] SomeOtherTest.FLAKY_Baz
 Some error message for a flaky test.
 [  FAILED  ] SomeOtherTest.FLAKY_Baz (40 ms)
 [----------] 2 tests from SomeOtherTest (60 ms total)
 
 [----------] Global test environment tear-down
-[==========] 7 tests from 3 test cases ran. (3750 ms total)
+[==========] 8 tests from 3 test cases ran. (3750 ms total)
 [  PASSED  ] 4 tests.
-[  FAILED  ] 3 tests, listed below:
+[  FAILED  ] 4 tests, listed below:
 [  FAILED  ] NavigationControllerTest.Reload
 [  FAILED  ] NavigationControllerTest/SpdyNetworkTransTest.Constructor/0
 [  FAILED  ] SomeOtherTest.SwitchTypes
+[  FAILED  ] SomeOtherTest.FAILS_ThisTestTimesOut
 
  1 FAILED TEST
   YOU HAVE 10 DISABLED TESTS
 
   YOU HAVE 2 FLAKY TESTS
 
 program finished with exit code 1
-""" % {'switch_errors' : SWITCH_ERRORS})
+""")
 
 TEST_DATA_CRASH = """
 [==========] Running 7 tests from 3 test cases.
 [----------] Global test environment set-up.
 [----------] 1 test from HunspellTest
 [ RUN      ] HunspellTest.Crashes
 Oops, this test crashed!
 """
 
 VALGRIND_HASH = 'B254345E4D3B6A00'
@@ skipping 68 matching lines @@
 
 [----------] 4 tests from SomeOtherTest
 [ RUN      ] SomeOtherTest.SwitchTypes
 %(switch_errors)s
 [  FAILED  ] SomeOtherTest.SwitchTypes (40 ms)
 [ RUN      ] SomeOtherTest.Foo
 [       OK ] SomeOtherTest.Foo (20 ms)
 [ RUN      ] SomeOtherTest.FAILS_Bar
 Some error message for a failing test.
 [  FAILED  ] SomeOtherTest.FAILS_Bar (40 ms)
+[ RUN      ] SomeOtherTest.FAILS_ThisTestTimesOut
+"""  % {'switch_errors' : SWITCH_ERRORS} +
+'[0521/041343:ERROR:test_launcher.cc(384)] Test timeout (5000 ms) exceeded '
+'for SomeOtherTest.FAILS_ThisTestTimesOut' + """
 [ RUN      ] SomeOtherTest.FLAKY_Baz
 Some error message for a flaky test.
 [  FAILED  ] SomeOtherTest.FLAKY_Baz (40 ms)
 [----------] 2 tests from SomeOtherTest (60 ms total)
 
 [----------] Global test environment tear-down
-[==========] 6 tests from 3 test cases ran. (3750 ms total)
+[==========] 7 tests from 3 test cases ran. (3750 ms total)
 [  PASSED  ] 5 tests.
-[  FAILED  ] 1 test, listed below:
+[  FAILED  ] 2 test, listed below:
 [  FAILED  ] SomeOtherTest.SwitchTypes
+[  FAILED  ] SomeOtherTest.FAILS_ThisTestTimesOut
 
  1 FAILED TEST
   YOU HAVE 10 DISABLED TESTS
 
   YOU HAVE 2 FLAKY TESTS
-""" % {'switch_errors' : SWITCH_ERRORS})
+""")
 
 TEST_DATA_SHARD_1 = ("""Note: This is test shard 13 of 30.
 [==========] Running 5 tests from 2 test cases.
 [----------] Global test environment set-up.
 [----------] 4 tests from NavigationControllerTest
 [ RUN      ] NavigationControllerTest.Defaults
 [       OK ] NavigationControllerTest.Defaults (48 ms)
 [ RUN      ] NavigationControllerTest.Reload
 %(reload_errors)s
 [  FAILED  ] NavigationControllerTest.Reload (2 ms)
@@ skipping 177 matching lines @@
 
     parser = gtest_utils.GTestLogParser()
     for line in FAILING_TESTS_OUTPUT.splitlines():
       parser.ProcessLine(line)
     self.assertEqual(FAILING_TESTS_EXPECTED,
                      parser.FailedTests(True, True))
 
 
 if __name__ == '__main__':
   unittest.main()