diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-03-04 22:15:53 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-03-04 22:15:53 +0000 |
| commit | f6fb532f0825024feda89c863e33a51b6ff377f5 (patch) | |
| tree | 9a7a9aac24a5946d5bca4e04ec681ecd38b6199c /test/gtest_output_test.py | |
| parent | 2b608176ebb3ae26cd536dbb5809d6941affec33 (diff) | |
| download | googletest-f6fb532f0825024feda89c863e33a51b6ff377f5.tar.gz | |
Renames ThreadStartSempahore to Notificaton (by Vlad Losev); adds threading tests for SCOPED_TRACE() (by Vlad Losev); replaces native pthread calls with gtest's threading constructs (by Vlad Losev); fixes flakiness in CountedDestructor (by Vlad Losev); minor MSVC 7.1 clean-up (by Zhanyong Wan).
git-svn-id: http://googletest.googlecode.com/svn/trunk@386 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'test/gtest_output_test.py')
| -rwxr-xr-x | test/gtest_output_test.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/gtest_output_test.py b/test/gtest_output_test.py index 125970a..192030a 100755 --- a/test/gtest_output_test.py +++ b/test/gtest_output_test.py @@ -282,7 +282,7 @@ class GTestOutputTest(gtest_test_utils.TestCase): normalized_golden = RemoveTypeInfoDetails(golden) if CAN_GENERATE_GOLDEN_FILE: - self.assert_(normalized_golden == normalized_actual) + self.assertEqual(normalized_golden, normalized_actual) else: normalized_actual = RemoveTestCounts(normalized_actual) normalized_golden = RemoveTestCounts(self.RemoveUnsupportedTests( @@ -299,7 +299,7 @@ class GTestOutputTest(gtest_test_utils.TestCase): '_gtest_output_test_normalized_golden.txt'), 'wb').write( normalized_golden) - self.assert_(normalized_golden == normalized_actual) + self.assertEqual(normalized_golden, normalized_actual) if __name__ == '__main__': |