aboutsummaryrefslogtreecommitdiffstats
path: root/test/gmock_output_test.py
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2009-12-01 19:42:25 +0000
committerzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2009-12-01 19:42:25 +0000
commitf6d6a22b8eea931b49a8c33de3092d4623ed0d41 (patch)
treea0608d2270992b90160a57c68014fb65ade117df /test/gmock_output_test.py
parent19eb9e9e3d4d5a4f0eee786d7664ca0e45137390 (diff)
downloadgoogletest-f6d6a22b8eea931b49a8c33de3092d4623ed0d41.tar.gz
googletest-f6d6a22b8eea931b49a8c33de3092d4623ed0d41.tar.bz2
googletest-f6d6a22b8eea931b49a8c33de3092d4623ed0d41.zip
Fixes Cygwin compatibility (by Vlad Losev); Improves Python tests (by Vlad Losev); Fixes ambiguous call to implicit_cast; Uses gtest's SkipPrefix() instead gmock's own (by Vlad Losev).
Diffstat (limited to 'test/gmock_output_test.py')
-rwxr-xr-xtest/gmock_output_test.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/gmock_output_test.py b/test/gmock_output_test.py
index c5f05b34..614a58fa 100755
--- a/test/gmock_output_test.py
+++ b/test/gmock_output_test.py
@@ -43,7 +43,6 @@ __author__ = 'wan@google.com (Zhanyong Wan)'
import os
import re
import sys
-import unittest
import gmock_test_utils
@@ -154,7 +153,7 @@ def GetNormalizedCommandOutputAndLeakyTests(cmd):
return GetNormalizedOutputAndLeakyTests(GetShellCommandOutput(cmd))
-class GMockOutputTest(unittest.TestCase):
+class GMockOutputTest(gmock_test_utils.TestCase):
def testOutput(self):
(output, leaky_tests) = GetNormalizedCommandOutputAndLeakyTests(COMMAND)
golden_file = open(GOLDEN_PATH, 'rb')