coffee/googletest
1
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-12-07 01:06:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix GMockOutputTest on Windows.

Browse Source
This commit is contained in:
davidmatson 2022-10-03 15:17:22 -07:00 committed by David Matson
parent 9b0b00a104
commit 25cde5f232
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
googlemock/test/gmock_output_test.py
View File

@ -157,7 +157,7 @@ class GMockOutputTest(gmock_test_utils.TestCase):
def testOutput(self): def testOutput(self):
(output, leaky_tests) = GetNormalizedCommandOutputAndLeakyTests(COMMAND) (output, leaky_tests) = GetNormalizedCommandOutputAndLeakyTests(COMMAND)
golden_file = open(GOLDEN_PATH, 'rb') golden_file = open(GOLDEN_PATH, 'rb')
golden = golden_file.read().decode('utf-8') golden = ToUnixLineEnding(golden_file.read().decode('utf-8'))
golden_file.close() golden_file.close()
# On Windows the repository might have been checked out with \r\n line # On Windows the repository might have been checked out with \r\n line
# endings, so normalize it here. # endings, so normalize it here.

3
googlemock/test/gmock_output_test_golden.txt
View File

@ -309,8 +309,7 @@ Stack trace:
FILE:#: Failure FILE:#: Failure
Value of: (std::pair<int, bool>(42, true)) Value of: (std::pair<int, bool>(42, true))
Expected: is pair (first: is >= 48, second: true) Expected: is pair (first: is >= 48, second: true)
Actual: (42, true) (of type std::pair<int,bool>) Actual: (42, true)
[ FAILED ] GMockOutputTest.PrintsMatcher [ FAILED ] GMockOutputTest.PrintsMatcher
[ FAILED ] GMockOutputTest.UnexpectedCall [ FAILED ] GMockOutputTest.UnexpectedCall
[ FAILED ] GMockOutputTest.UnexpectedCallToVoidFunction [ FAILED ] GMockOutputTest.UnexpectedCallToVoidFunction