gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:google/googletest

Browse Source
This commit is contained in:
Gennadiy Civil 2019-07-17 15:36:04 -04:00
commit ad52f7d0bd
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
googlemock/include/gmock/gmock-spec-builders.h
View File

@ -61,6 +61,7 @@
#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_ #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
#define GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
#include <functional>
#include <map> #include <map>
#include <memory> #include <memory>
#include <set> #include <set>

4
googlemock/test/gmock_output_test.py
View File

@ -39,6 +39,7 @@ gmock_output_test.py
""" """
from io import open # pylint: disable=redefined-builtin, g-importing-member
import os import os
import re import re
import sys import sys
@ -152,10 +153,11 @@ def GetNormalizedCommandOutputAndLeakyTests(cmd):
class GMockOutputTest(gmock_test_utils.TestCase): 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() golden = golden_file.read().decode('utf-8')
golden_file.close() golden_file.close()
# The normalized output should match the golden file. # The normalized output should match the golden file.