Use the version that passes the landscape tests. Add a test for one of the fix.

2 files changed, 4 insertions, 1 deletions

diff --git a/mocker.py b/mocker.py
index 37e4ddb..c34aeba 100644
--- a/mocker.py
+++ b/mocker.py
@@ -114,6 +114,7 @@ class MockerTestCase(unittest.TestCase):
                             return result
                         result.addCallback(verify)
                     else:
+                        self.mocker.reset()
                         self.mocker.verify()
                     return result
             # Copy all attributes from the original method..
@@ -669,7 +670,7 @@ class MockerBase(object):
         event.add_task(patcher)
         mock = Mock(self, object=object, patcher=patcher,
                     passthrough=True, spec=spec)
-        object.__mocker_mock__ = mock
+        patcher.patch_attr(object, '__mocker_mock__', mock)
         return mock
 
     def act(self, path):
diff --git a/test.py b/test.py
index 334407f..9ce5c01 100755
--- a/test.py
+++ b/test.py
@@ -3920,6 +3920,8 @@ class PatcherTest(TestCase):
         self.mocker.replay()
         self.assertEquals(self.C().method(), "mocked")
         self.assertRaises(AssertionError, self.C().method)
+        self.mocker.restore()
+        self.assertEquals(getattr(self.C, "__mocker_mock__", None), None)
 
     def test_recorder_instance_getattr(self):
         self.C.attr = "original"