Fixes threading annotations and compatibility with C++11, which doesn't
allow exepctions to be thrown in a destructor.
This commit is contained in:
		| @@ -117,14 +117,17 @@ class CatchCxxExceptionsTest(gtest_test_utils.TestCase): | ||||
|                  '"CxxExceptionInConstructorTest" (no quotes) ' | ||||
|                  'appears on the same line as words "called unexpectedly"') | ||||
|  | ||||
|   def testCatchesCxxExceptionsInFixtureDestructor(self): | ||||
|     self.assert_('C++ exception with description ' | ||||
|                  '"Standard C++ exception" thrown ' | ||||
|                  'in the test fixture\'s destructor' | ||||
|                  in EX_BINARY_OUTPUT) | ||||
|     self.assert_('CxxExceptionInDestructorTest::TearDownTestCase() ' | ||||
|                  'called as expected.' | ||||
|                  in EX_BINARY_OUTPUT) | ||||
|   if ('CxxExceptionInDestructorTest.ThrowsExceptionInDestructor' in | ||||
|       EX_BINARY_OUTPUT): | ||||
|  | ||||
|     def testCatchesCxxExceptionsInFixtureDestructor(self): | ||||
|       self.assert_('C++ exception with description ' | ||||
|                    '"Standard C++ exception" thrown ' | ||||
|                    'in the test fixture\'s destructor' | ||||
|                    in EX_BINARY_OUTPUT) | ||||
|       self.assert_('CxxExceptionInDestructorTest::TearDownTestCase() ' | ||||
|                    'called as expected.' | ||||
|                    in EX_BINARY_OUTPUT) | ||||
|  | ||||
|   def testCatchesCxxExceptionsInSetUpTestCase(self): | ||||
|     self.assert_('C++ exception with description "Standard C++ exception"' | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 zhanyong.wan
					zhanyong.wan