Adding PropertyMock

docs/changelog.txt

@@ -15,6 +15,7 @@ The standard library version!
 * Added the `mock_open` helper function for mocking open as a context manager
 * `__class__` is assignable, so a mock can pass an `isinstance` check without
   requiring a spec
+* Addition of `PropertyMock`
 
 
 2012/02/13 Version 0.8.0

mock.py

@@ -26,6 +26,7 @@ __all__ = (
     'NonCallableMock',
     'NonCallableMagicMock',
     'mock_open',
+    'PropertyMock',
 )
 
 
@@ -2239,3 +2240,10 @@ def mock_open(mock=None, read_data=None):
 
     mock.return_value = handle
     return mock
+
+class PropertyMock(Mock):
+    """A Mock variant with __get__ and __set__ methods to act as a property"""
+    def __get__(self, obj, obj_type):
+        return self()
+    def __set__(self, obj, val):
+        self(val)

tests/testhelpers.py

@@ -6,7 +6,7 @@ from tests.support import unittest2, inPy3k
 
 from mock import (
     call, _Call, create_autospec, MagicMock,
-    Mock, ANY, _CallList, patch
+    Mock, ANY, _CallList, patch, PropertyMock
 )
 
 from datetime import datetime
@@ -863,6 +863,23 @@ class TestCallList(unittest2.TestCase):
         self.assertEqual(str(mock.mock_calls), expected)
 
 
+    def test_propertymock(self):
+        p = patch('%s.SomeClass.one' % __name__, new_callable=PropertyMock)
+        mock = p.start()
+        try:
+            SomeClass.one
+            mock.assert_called_once_with()
+
+            s = SomeClass()
+            s.one
+            mock.assert_called_with()
+            self.assertEqual(mock.mock_calls, [call(), call()])
+
+            s.one = 3
+            self.assertEqual(mock.mock_calls, [call(), call(), call(3)])
+        finally:
+            p.stop()
+
 
 if __name__ == '__main__':
     unittest2.main()