summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Foord <michael@voidspace.org.uk>2012-03-08 10:50:27 -0800
committerMichael Foord <michael@voidspace.org.uk>2012-03-08 10:50:27 -0800
commit4d456e5d0293424575db0aeb83a7047378e670b3 (patch)
treef7c92652b08385cd8244e7a6d326acc68717342f
parent862e6a9af2bff691474a6f0705b8dbbc968859da (diff)
downloadmock-release-0.8-maint.tar.gz
Removed failing test for spec inheritance - should not be on by defaultrelease-0.8-maint
-rw-r--r--docs/changelog.txt1
-rw-r--r--tests/testmock.py13
2 files changed, 0 insertions, 14 deletions
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 2560b6f..c54ba12 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -7,7 +7,6 @@ CHANGELOG
2012/XX/XX Version 0.8.1
------------------------
-* BUGFIX: `return_value` of a `Mock` with a class as `spec` inherits the `spec`
* BUGFIX: `create_autospec` works correctly for calling mocked unbound methods
diff --git a/tests/testmock.py b/tests/testmock.py
index 604c688..31ea50c 100644
--- a/tests/testmock.py
+++ b/tests/testmock.py
@@ -420,19 +420,6 @@ class MockTest(unittest2.TestCase):
test_attributes(Mock(spec=Something()))
- def test_spec_return_value(self):
- class A(object):
- pass
- for Klass in Mock, MagicMock:
- for arg in ('spec', 'spec_set'):
- kwargs = {arg: A}
- m = Klass(**kwargs)
- self.assertTrue(isinstance(m, A))
-
- instance = m()
- self.assertTrue(isinstance(instance, A))
-
-
def test_wraps_calls(self):
real = Mock()