summaryrefslogtreecommitdiff
path: root/mocker.py
diff options
context:
space:
mode:
authorThomas Hervé <thomas@canonical.com>2008-06-30 17:38:09 +0200
committerThomas Hervé <thomas@canonical.com>2008-06-30 17:38:09 +0200
commit77375c5cf3c1f47006322c7c693a3fda9ac383d6 (patch)
treecddad95ec8224ad6e09a89de32911a057921347c /mocker.py
parent87e6cf304120f11ff7f163f1a98291682c34b988 (diff)
downloadmocker-77375c5cf3c1f47006322c7c693a3fda9ac383d6.tar.gz
Use the version that passes the landscape tests. Add a test for one of the fix.
Diffstat (limited to 'mocker.py')
-rw-r--r--mocker.py3
1 files changed, 2 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):