From 77375c5cf3c1f47006322c7c693a3fda9ac383d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Herv=C3=A9?= <thomas@canonical.com>
Date: Mon, 30 Jun 2008 17:38:09 +0200
Subject: Use the version that passes the landscape tests. Add a test for one
 of the fix.

---
 mocker.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'mocker.py')

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):
-- 
cgit v1.2.1