When cleaning up on MockerTestCase, use reset() rather than restore(),

so that the same test case instance may be run more than once (like
Trial does).

2 files changed, 12 insertions, 1 deletions

diff --git a/mocker.py b/mocker.py
index 1e92f72..bca5160 100644
--- a/mocker.py
+++ b/mocker.py
@@ -149,7 +149,7 @@ class MockerTestCase(unittest.TestCase):
                 os.unlink(path)
             elif os.path.isdir(path):
                 shutil.rmtree(path)
-        self.mocker.restore()
+        self.mocker.reset()
         for func, args, kwargs in self.__cleanup_funcs:
             func(*args, **kwargs)
 
diff --git a/test.py b/test.py
index 173e51e..334407f 100755
--- a/test.py
+++ b/test.py
@@ -390,6 +390,17 @@ class MockerTestCaseTest(TestCase):
         self.assertEquals(len(result.failures), 1)
         self.assertTrue("BOOM!" in result.failures[0][1])
 
+        del calls[:]
+
+        result = unittest.TestResult()
+        # Running twice in the same instance (Trial does that).
+        test = MyTest("test_method")
+        test.run(result)
+        test.run(result)
+
+        self.assertEquals(calls, ["verify", "restore", "verify", "restore"])
+        self.assertTrue(result.wasSuccessful())
+
     def test_expectation_failure_acts_appropriately(self):
         class MyTest(MockerTestCase):
             def test_method(self):