diff options
| author | Chris Johnson <chrisjohnsonmail@gmail.com> | 2019-08-27 18:00:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-27 18:00:04 -0500 |
| commit | 85f059f03d56ce82cf8f68cf7505b695a0c730c2 (patch) | |
| tree | e715b911578e831d7a3fdf46bbf2bdbece4fafc3 /googlemock/test/gmock_output_test.py | |
| parent | 130e5aa86a7a71501cf8fa7cd6f507928f01bd79 (diff) | |
| parent | fdd6a1dc8c74bf37211c14a1b2e4b64755bb3380 (diff) | |
| download | googletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.tar.gz googletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.tar.bz2 googletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.zip | |
Merge pull request #3 from google/master
Update master
Diffstat (limited to 'googlemock/test/gmock_output_test.py')
| -rwxr-xr-x | googlemock/test/gmock_output_test.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/googlemock/test/gmock_output_test.py b/googlemock/test/gmock_output_test.py index 0527bd93..25f99f2b 100755 --- a/googlemock/test/gmock_output_test.py +++ b/googlemock/test/gmock_output_test.py @@ -39,6 +39,7 @@ gmock_output_test.py """ +from io import open # pylint: disable=redefined-builtin, g-importing-member import os import re import sys @@ -152,10 +153,11 @@ def GetNormalizedCommandOutputAndLeakyTests(cmd): class GMockOutputTest(gmock_test_utils.TestCase): + def testOutput(self): (output, leaky_tests) = GetNormalizedCommandOutputAndLeakyTests(COMMAND) golden_file = open(GOLDEN_PATH, 'rb') - golden = golden_file.read() + golden = golden_file.read().decode('utf-8') golden_file.close() # The normalized output should match the golden file. |