Skip to content

Mock and MagickMock subclassing NonCallableMock #3871

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
srittau merged 3 commits into from
Mar 24, 2020
Merged

Mock and MagickMock subclassing NonCallableMock #3871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6b8e7e
Mock and MagickMock subclassing NonCallableMock
rodrigondec Mar 20, 2020
64faadd
method mock_add_spec on NonCallableMagicMock & MagicMock
rodrigondec Mar 24, 2020
5e37202
flake8
rodrigondec Mar 24, 2020
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
10 changes: 7 additions & 3 deletions stdlib/3/unittest/mock.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class CallableMixin(Base):
def __init__(self, spec: Optional[Any] = ..., side_effect: Optional[Any] = ..., return_value: Any = ..., wraps: Optional[Any] = ..., name: Optional[Any] = ..., spec_set: Optional[Any] = ..., parent: Optional[Any] = ..., _spec_state: Optional[Any] = ..., _new_name: Any = ..., _new_parent: Optional[Any] = ..., **kwargs: Any) -> None: ...
def __call__(_mock_self, *args: Any, **kwargs: Any) -> Any: ...

Mock = Any
class Mock(NonCallableMock, CallableMixin): ...

class _patch:
attribute_name: Any
Expand Down Expand Up @@ -158,8 +158,12 @@ patch: _patcher
class MagicMixin:
def __init__(self, *args: Any, **kw: Any) -> None: ...

NonCallableMagicMock = Any
MagicMock = Any
class NonCallableMagicMock(MagicMixin, NonCallableMock):
def mock_add_spec(self, spec: Any, spec_set: bool = ...) -> None: ...

class MagicMock(MagicMixin, Mock):
def mock_add_spec(self, spec: Any, spec_set: bool = ...) -> None: ...

if sys.version_info >= (3, 8):
AsyncMock = Any

Expand Down
10 changes: 7 additions & 3 deletions third_party/2and3/mock.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class CallableMixin(Base):
def __init__(self, spec: Optional[Any] = ..., side_effect: Optional[Any] = ..., return_value: Any = ..., wraps: Optional[Any] = ..., name: Optional[Any] = ..., spec_set: Optional[Any] = ..., parent: Optional[Any] = ..., _spec_state: Optional[Any] = ..., _new_name: Any = ..., _new_parent: Optional[Any] = ..., **kwargs: Any) -> None: ...
def __call__(_mock_self, *args: Any, **kwargs: Any) -> Any: ...

Mock = Any
class Mock(NonCallableMock, CallableMixin): ...

class _patch:
attribute_name: Any
Expand Down Expand Up @@ -158,8 +158,12 @@ patch: _patcher
class MagicMixin:
def __init__(self, *args: Any, **kw: Any) -> None: ...

NonCallableMagicMock = Any
MagicMock = Any
class NonCallableMagicMock(MagicMixin, NonCallableMock):
def mock_add_spec(self, spec: Any, spec_set: bool = ...) -> None: ...

class MagicMock(MagicMixin, Mock):
def mock_add_spec(self, spec: Any, spec_set: bool = ...) -> None: ...

if sys.version_info >= (3, 8):
AsyncMock = Any

Expand Down