summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMichael Foord <michael@voidspace.org.uk>2012-04-13 16:57:52 +0100
committerMichael Foord <michael@voidspace.org.uk>2012-04-13 16:57:52 +0100
commitecbd9dabe4f4311052e9b15500fa6043a02d24ec (patch)
tree41ac98c799334f5a1f2c6d9bec984c16f7d8745b /tests
parent7e6dd774aec284894407cad2c9c620a063b5f832 (diff)
downloadmock-ecbd9dabe4f4311052e9b15500fa6043a02d24ec.tar.gz
PropertyMock attributes and return values are standard MagicMocks
Diffstat (limited to 'tests')
-rw-r--r--tests/testhelpers.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/testhelpers.py b/tests/testhelpers.py
index e80321d..b92f511 100644
--- a/tests/testhelpers.py
+++ b/tests/testhelpers.py
@@ -881,5 +881,16 @@ class TestCallList(unittest2.TestCase):
p.stop()
+ def test_propertymock_returnvalue(self):
+ m = MagicMock()
+ p = PropertyMock()
+ type(m).foo = p
+
+ returned = m.foo
+ p.assert_called_once_with()
+ self.assertIsInstance(returned, MagicMock)
+ self.assertNotIsInstance(returned, PropertyMock)
+
+
if __name__ == '__main__':
unittest2.main()