From 25cde5f2327a634cc3c4b2c036e23d2a2c0e4ce0 Mon Sep 17 00:00:00 2001 From: davidmatson Date: Mon, 3 Oct 2022 15:17:22 -0700 Subject: [PATCH] Fix GMockOutputTest on Windows. --- googlemock/test/gmock_output_test.py | 2 +- googlemock/test/gmock_output_test_golden.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/googlemock/test/gmock_output_test.py b/googlemock/test/gmock_output_test.py index 7c24d6832..3fbed9d40 100755 --- a/googlemock/test/gmock_output_test.py +++ b/googlemock/test/gmock_output_test.py @@ -157,7 +157,7 @@ class GMockOutputTest(gmock_test_utils.TestCase): def testOutput(self): (output, leaky_tests) = GetNormalizedCommandOutputAndLeakyTests(COMMAND) golden_file = open(GOLDEN_PATH, 'rb') - golden = golden_file.read().decode('utf-8') + golden = ToUnixLineEnding(golden_file.read().decode('utf-8')) golden_file.close() # On Windows the repository might have been checked out with \r\n line # endings, so normalize it here. diff --git a/googlemock/test/gmock_output_test_golden.txt b/googlemock/test/gmock_output_test_golden.txt index ca88af029..5537d56e3 100644 --- a/googlemock/test/gmock_output_test_golden.txt +++ b/googlemock/test/gmock_output_test_golden.txt @@ -309,8 +309,7 @@ Stack trace: FILE:#: Failure Value of: (std::pair(42, true)) Expected: is pair (first: is >= 48, second: true) - Actual: (42, true) (of type std::pair) - + Actual: (42, true) [ FAILED ] GMockOutputTest.PrintsMatcher [ FAILED ] GMockOutputTest.UnexpectedCall [ FAILED ] GMockOutputTest.UnexpectedCallToVoidFunction