From ac7a126f39d5bcd909b78c9e69900c76659b1bbb Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Tue, 17 Jan 2023 07:12:03 -0800 Subject: [PATCH] gmock_output_test: normalize golden file output to unix line endings When checked out on Windows, the repo might use \r\n line endings, and so the golden output has them. Adjust for that. PiperOrigin-RevId: 502577222 Change-Id: Iabfe537f6d95a49bf6bdcb934e855d28c65f6f89 --- googlemock/test/gmock_output_test.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/googlemock/test/gmock_output_test.py b/googlemock/test/gmock_output_test.py index 6b4ab9015d..d7c3f27e87 100755 --- a/googlemock/test/gmock_output_test.py +++ b/googlemock/test/gmock_output_test.py @@ -159,6 +159,9 @@ def testOutput(self): golden_file = open(GOLDEN_PATH, 'rb') golden = 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. + golden = ToUnixLineEnding(golden) # The normalized output should match the golden file. self.assertEqual(golden, output)