From b49cb7b38667e64696eff4833a46036f9f20ac5e Mon Sep 17 00:00:00 2001 From: Michael Foord Date: Sun, 25 Mar 2012 18:37:46 +0100 Subject: Some test fixes to always clean up patches --- tests/testpatch.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/testpatch.py b/tests/testpatch.py index 5f6a1b1..c9af333 100644 --- a/tests/testpatch.py +++ b/tests/testpatch.py @@ -726,8 +726,8 @@ class PatchTest(unittest2.TestCase): patcher = patch('%s.something' % __name__) self.assertIs(something, original) mock = patcher.start() - self.assertIsNot(mock, original) try: + self.assertIsNot(mock, original) self.assertIs(something, mock) finally: patcher.stop() @@ -746,8 +746,8 @@ class PatchTest(unittest2.TestCase): patcher = patch.object(PTModule, 'something', 'foo') self.assertIs(something, original) replaced = patcher.start() - self.assertEqual(replaced, 'foo') try: + self.assertEqual(replaced, 'foo') self.assertIs(something, replaced) finally: patcher.stop() @@ -761,9 +761,10 @@ class PatchTest(unittest2.TestCase): self.assertEqual(d, original) patcher.start() - self.assertEqual(d, {'spam': 'eggs'}) - - patcher.stop() + try: + self.assertEqual(d, {'spam': 'eggs'}) + finally: + patcher.stop() self.assertEqual(d, original) -- cgit v1.2.1