openstack
/
oslotest
Code Issues Proposed changes

Merge "mock: Apply autospec to a mock's return_value"

This commit is contained in:
Zuul 2018-04-26 16:11:08 +00:00 committed by Gerrit Code Review
parent 9837c5ef98 6baff0eda4
commit 974666550e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oslotest/mock_fixture.py
View File

@ -44,13 +44,19 @@ class _AutospecMockMixin(object):
def __init__(self, *args, **kwargs):
super(_AutospecMockMixin, self).__init__(*args, **kwargs)
self.__dict__['_autospec'] = kwargs.get('autospec')
autospec = kwargs.get('autospec')
self.__dict__['_autospec'] = autospec
_mock_methods = self.__dict__['_mock_methods']
if _mock_methods:
# this will allow us to be able to set _mock_check_sig if
# the spec_set argument has been given.
_mock_methods.append('_mock_check_sig')
# callable mocks with autospecs (e.g.: the given autospec is a class)
# should have their return values autospeced as well.
if autospec:
self.return_value.__dict__['_autospec'] = autospec
def __getattr__(self, name):
attr = super(_AutospecMockMixin, self).__getattr__(name)

1
oslotest/tests/unit/test_mock_fixture.py
View File

@ -74,6 +74,7 @@ class MockSanityTestCase(testtools.TestCase):
for spec in [Foo, Foo()]:
foo = mock_cls(autospec=spec)
self._check_autospeced_foo(foo)
self._check_autospeced_foo(foo())
def test_mock_autospec_all_members(self):
self._check_mock_autospec_all_members(mock.Mock)