Skip to content

bpo-38122: minor fixes to AsyncMock spec handling #16099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matrixise merged 8 commits into from
Sep 13, 2019
Merged

bpo-38122: minor fixes to AsyncMock spec handling #16099

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
917d722
Port tests from original PR
voidspace Sep 11, 2019
890795e
Port tests from original PR
voidspace Sep 11, 2019
cfb1bb8
Merge branch 'spec-signatures' of https://github.com/voidspace/cpytho…
voidspace Sep 13, 2019
9f8a081
Minor fixes
voidspace Sep 13, 2019
327b33c
Remove extraneous tests
voidspace Sep 13, 2019
6f058d9
Remove extraneous test
voidspace Sep 13, 2019
8c2ab3b
Merge branch 'master' into minor-fixes
voidspace Sep 13, 2019
fbc12ef
Fix whitespace
matrixise Sep 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Port tests from original PR
  • Loading branch information
@voidspace
voidspace committed Sep 13, 2019
commit 890795e5f06f3683f351c090ec376ea6ae6b4123
49 changes: 49 additions & 0 deletions Lib/unittest/test/testmock/testmock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,48 @@ def test_only_allowed_methods_exist(self):
)


def _check_autospeced_something(self, something):
for method_name in ['meth', 'cmeth', 'smeth']:
mock_method = getattr(something, method_name)

# check that the methods are callable with correct args.
mock_method(sentinel.a, sentinel.b, sentinel.c)
mock_method(sentinel.a, sentinel.b, sentinel.c, d=sentinel.d)
mock_method.assert_has_calls([
call(sentinel.a, sentinel.b, sentinel.c),
call(sentinel.a, sentinel.b, sentinel.c, d=sentinel.d)])

# assert that TypeError is raised if the method signature is not
# respected.
self.assertRaises(TypeError, mock_method)
self.assertRaises(TypeError, mock_method, sentinel.a)
self.assertRaises(TypeError, mock_method, a=sentinel.a)
self.assertRaises(TypeError, mock_method, sentinel.a, sentinel.b,
sentinel.c, e=sentinel.e)

# assert that AttributeError is raised if the method does not exist.
self.assertRaises(AttributeError, getattr, something, 'foolish')


def test_mock_autospec_all_members(self):
for spec in [Something, Something()]:
mock_something = Mock(autospec=spec)
self._check_autospeced_something(mock_something)


def test_mock_spec_function(self):
def foo(lish):
pass

mock_foo = Mock(spec=foo)

mock_foo(sentinel.lish)
mock_foo.assert_called_once_with(sentinel.lish)
self.assertRaises(TypeError, mock_foo)
self.assertRaises(TypeError, mock_foo, sentinel.foo, sentinel.lish)
self.assertRaises(TypeError, mock_foo, foo=sentinel.foo)


def test_from_spec(self):
class Something(object):
x = 3
Expand Down Expand Up @@ -1387,6 +1429,13 @@ def meth1(self, a, b): pass
)


def test_mock_add_spec_autospec_all_members(self):
for spec in [Something, Something()]:
mock_something = Mock()
mock_something.mock_add_spec(spec, autospec=True)
self._check_autospeced_something(mock_something)


def test_assert_has_calls_nested_without_spec(self):
m = MagicMock()
m().foo().bar().baz()
Expand Down