From 5c7342b0fd9caf32d9b5d3077175e2bf21b7460f Mon Sep 17 00:00:00 2001 From: Gustavo Niemeyer Date: Wed, 5 Dec 2007 20:43:39 -0200 Subject: Implemented MockerTestCase.addCleanup(). It allows one to register cleanup functions to be called after the test is complete. --- test.py | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'test.py') diff --git a/test.py b/test.py index 92fb8a3..3d27d54 100755 --- a/test.py +++ b/test.py @@ -373,7 +373,7 @@ class MockerTestCaseTest(TestCase): result = unittest.TestResult() MyTest("test_method").run(result) - self.assertEquals(calls, ["restore", "verify"]) + self.assertEquals(calls, ["verify", "restore"]) self.assertTrue(result.wasSuccessful()) del calls[:] @@ -400,6 +400,22 @@ class MockerTestCaseTest(TestCase): self.assertEquals(len(result.failures), 1) self.assertTrue("mock.x" in result.failures[0][1]) + def test_add_cleanup(self): + stash = [] + def func(a, b): + stash.append((a, b)) + + class MyTest(MockerTestCase): + def tearDown(self): + self.addCleanup(func, 3, b=4) + def test_method(self): + self.addCleanup(func, 1, b=2) + stash.append(stash[:]) + + MyTest("test_method").run() + + self.assertEquals(stash, [[], (1, 2), (3, 4)]) + def test_twisted_trial_deferred_support(self): calls = [] callbacks = [] @@ -431,14 +447,7 @@ class MockerTestCaseTest(TestCase): self.assertEquals(calls, []) self.assertEquals(len(callbacks), 1) self.assertEquals(callbacks[-1]("foo"), "foo") - self.assertEquals(calls, ["restore", "verify"]) - - test.mocker.replay() - del calls[:] - - self.assertEquals(len(errbacks), 1) - self.assertEquals(errbacks[-1]("foo"), "foo") - self.assertEquals(calls, ["restore"]) + self.assertEquals(calls, ["verify"]) def test_fail_unless_is_raises_on_mismatch(self): -- cgit v1.2.1