summaryrefslogtreecommitdiffstats
path: root/Lib/unittest/mock.py
Commit message (Collapse)AuthorAgeFilesLines
* bpo-35330: Don't call the wrapped object if `side_effect` is set (GH11034)Miss Islington (bot)2018-12-081-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | * tests: Further validate `wraps` functionality in `unittest.mock.Mock` Add more tests to validate how `wraps` interacts with other features of mocks. * Don't call the wrapped object if `side_effect` is set When a object is wrapped using `Mock(wraps=...)`, if an user sets a `side_effect` in one of their methods, return the value of `side_effect` and don't call the original object. * Refactor what to be called on `mock_call` When a `Mock` is called, it should return looking up in the following order: `side_effect`, `return_value`, `wraps`. If any of the first two return `mock.DEFAULT`, lookup in the next option. It makes no sense to check for `wraps` returning default, as it is supposed to be the original implementation and there is nothing to fallback to. (cherry picked from commit f05df0a4b679d0acfd0b1fe6187ba2d553b37afa) Co-authored-by: Mario Corchero <mariocj89@gmail.com>
* bpo-35357: Add _mock_ prefix to name/parent/from_kall attributes of ↵Miss Islington (bot)2018-12-041-14/+14
| | | | | | | | _Call/_MagicProxy. (GH-10873) Fix minor typo in test function name. (cherry picked from commit e63e617ebbe481c498bdf037a62e09f4f9f3963f) Co-authored-by: Andrew Dunai <andunai@gmail.com>
* bpo-35226: Fix equality for nested unittest.mock.call objects. (GH-10555)Miss Islington (bot)2018-12-031-23/+32
| | | | | | | Also refactor the call recording implementation and add some notes about its limitations. (cherry picked from commit 8ca0fa9d2f4de6e69f0902790432e0ab2f37ba68) Co-authored-by: Chris Withers <chris@withers.org>
* bpo-31177: Skip deleted attributes while calling reset_mock (GH-9302)Miss Islington (bot)2018-12-011-1/+1
| | | | | (cherry picked from commit edeca92c84a3b08902ecdfe987cde00c7e617887) Co-authored-by: Xtreak <tirkarthi@users.noreply.github.com>
* [3.6] bpo-35133: Fix mistakes when concatenate string literals on different ↵Serhiy Storchaka2018-11-051-1/+1
| | | | | | | | | | | lines. (GH-10284) (GH-10335) Two kind of mistakes: 1. Missed space. After concatenating there is no space between words. 2. Missed comma. Causes unintentional concatenating in a list of strings.. (cherry picked from commit 34fd4c20198dea6ab2fe8dc6d32d744d9bde868d)
* pypi.python.org -> pypi.org (GH-7613) (GH-7615)Miss Islington (bot)2018-06-111-1/+1
| | | | | (cherry picked from commit 9d6d06e8065d45f375f4a80e2d7e13b032da1f5b) Co-authored-by: Ned Deily <nad@python.org>
* [3.6] bpo-29403: Fix mock's broken autospec behavior on method-bound builtin ↵Berker Peksag2017-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | functions (GH-3) Cython will, in the right circumstances, offer a MethodType instance where im_func is a builtin function. Any instance of MethodType is automatically assumed to be a Python-defined function (more specifically, a function that has an inspectable signature), but _set_signature was still conservative in its assumptions. As a result _set_signature would return early with None instead of a mock since the im_func had no inspectable signature. This causes problems deeper inside mock, as _set_signature is assumed to _always_ return a mock, and nothing checked its return value. In similar corner cases, autospec will simply not check the spec of the function, so _set_signature is amended to now return early with the original, not-wrapped mock object. Patch by Aaron Gallagher. (cherry picked from commit 856cbcc12f2e4cca93af5dc7ed6bcea4dd942f10)
* bpo-28911: Clarify the behaviour of assert_called_once_with. (#252)Arne de Laat2017-02-231-2/+2
| | | (cherry picked from commit 9d56b34af2efc4e266bf3ae62da5cd2e422a42be)
* Issue #28735: Fixed the comparison of mock.MagickMock with mock.ANY.Serhiy Storchaka2017-01-211-2/+6
|\
| * Issue #28735: Fixed the comparison of mock.MagickMock with mock.ANY.Serhiy Storchaka2017-01-211-2/+6
| |
* | Fix unittest.mock._Call: don't ignore nameVictor Stinner2017-01-061-2/+1
| | | | | | | | | | | | | | Issue #28961: Fix unittest.mock._Call helper: don't ignore the name parameter anymore. Patch written by Jiajun Huang.
* | Fixes issue28380: unittest.mock Mock autospec functions now properly supportGregory P. Smith2016-10-061-0/+9
| | | | | | | | assert_called, assert_not_called, and assert_called_once.
* | Issue #26750: use inspect.isdatadescriptor instead of our ownGregory P. Smith2016-08-161-7/+1
|\ \ | |/ | | | | _is_data_descriptor().
| * Issue #26750: use inspect.isdatadescriptor instead of our ownGregory P. Smith2016-08-161-7/+1
| | | | | | | | _is_data_descriptor().
* | Issue #26750: unittest.mock.create_autospec() now works properly forGregory P. Smith2016-08-071-9/+5
|\ \ | |/ | | | | | | subclasses of property() and other data descriptors. Removes the never publicly used, never documented unittest.mock.DescriptorTypes tuple.
| * Issue #26750: unittest.mock.create_autospec() now works properlyGregory P. Smith2016-08-071-1/+9
| | | | | | | | for subclasses of property() and other data descriptors.
* | Issue #23804: Merge spelling and NEWS fixes from 3.5Martin Panter2016-07-111-1/+1
|\ \ | |/
| * English spelling and grammar fixesMartin Panter2016-07-111-1/+1
| |
* | Issue #23641: Added __getnewargs_ex__ to the list of special mock attributes.Serhiy Storchaka2016-06-191-0/+1
|\ \ | |/
| * Issue #23641: Added __getnewargs_ex__ to the list of special mock attributes.Serhiy Storchaka2016-06-191-0/+1
| |
* | Issue #21271: Adds new keyword only parameters in reset_mock callKushal Das2016-06-021-1/+6
| | | | | | | | | | We now have two keyword only parameters in the reset_mock function to selectively reset the return_value or the side_effects, or both.
* | Issue #26807: mock_open 'files' no longer error on readline at end of file.Robert Collins2016-05-161-0/+2
|\ \ | |/ | | | | Patch from Yolanda Robla.
| * Issue #26807: mock_open 'files' no longer error on readline at end of file.Robert Collins2016-05-161-0/+2
| | | | | | | | Patch from Yolanda Robla.
* | Issue #25195: Fix a regression in mock.MagicMockBerker Peksag2016-03-271-0/+3
|\ \ | |/ | | | | | | | | | | _Call is a subclass of tuple (changeset 3603bae63c13 only works for classes) so we need to implement __ne__ ourselves. Patch by Andrew Plummer.
| * Issue #25195: Fix a regression in mock.MagicMockBerker Peksag2016-03-271-0/+3
| | | | | | | | | | | | | | _Call is a subclass of tuple (changeset 3603bae63c13 only works for classes) so we need to implement __ne__ ourselves. Patch by Andrew Plummer.
* | Add Mock.assert_called()Victor Stinner2016-03-111-0/+18
| | | | | | | | | | Issue #26323: Add assert_called() and assert_called_once() methods to unittest.mock.Mock.
* | Issue25347 - Format the error message output of mock's assert_has_calls method.Senthil Kumaran2016-01-121-1/+1
|/ | | | Patch contributed by Robert Zimmerman.
* Issue #22138: Fix mock.patch behavior when patching descriptors. RestoreSenthil Kumaran2016-01-091-1/+4
| | | | | | original values after patching. Patch contributed by Sean McCully.
* Issue #24857: Comparing call_args to a long sequence now correctly returns aBerker Peksag2015-09-091-2/+3
|\ | | | | | | | | | | boolean result instead of raising an exception. Patch by A Kaptur.
| * Issue #24857: Comparing call_args to a long sequence now correctly returns aBerker Peksag2015-09-091-2/+3
| | | | | | | | | | | | boolean result instead of raising an exception. Patch by A Kaptur.
* | Issue #23004: mock_open() now reads binary data correctly when the type of ↵Berker Peksag2015-08-061-3/+4
|\ \ | |/ | | | | | | | | read_data is bytes. Initial patch by Aaron Hill.
| * Issue #23004: mock_open() now reads binary data correctly when the type of ↵Berker Peksag2015-08-061-3/+4
| | | | | | | | | | | | read_data is bytes. Initial patch by Aaron Hill.
* | Issue #21750: Further fixup to be styled like other mock APIs.Robert Collins2015-07-231-36/+43
|\ \ | |/
| * Issue #21750: Further fixup to be styled like other mock APIs.Robert Collins2015-07-231-36/+43
| |
* | Typo fix in mock.patch.Robert Collins2015-07-171-1/+1
|\ \ | |/ | | | | Patch from https://github.com/testing-cabal/mock/issues/215
| * Typo fix in mock.patch.Robert Collins2015-07-171-1/+1
| | | | | | | | Patch from https://github.com/testing-cabal/mock/issues/215
* | Issue #21750: mock_open.read_data can now be read from each instance, as itRobert Collins2015-07-171-33/+37
|\ \ | |/ | | | | could in Python 3.3.
| * Issue #21750: mock_open.read_data can now be read from each instance, as itRobert Collins2015-07-171-33/+37
| | | | | | | | could in Python 3.3.
* | - Issue #18622: unittest.mock.mock_open().reset_mock would recurse infinitely.Robert Collins2015-07-141-3/+9
|\ \ | |/ | | | | Patch from Nicola Palumbo and Laurent De Buyst.
| * - Issue #18622: unittest.mock.mock_open().reset_mock would recurse infinitely.Robert Collins2015-07-141-3/+9
| | | | | | | | Patch from Nicola Palumbo and Laurent De Buyst.
| * Issue #23310: Fix MagicMock's initializer to work with __methods__.Łukasz Langa2015-04-141-2/+3
| | | | | | | | Behavior equivalent to m.configure_mock(). Patch by Kasia Jachim.
* | Issue #23661: unittest.mock side_effects can now be exceptions again.Robert Collins2015-07-141-1/+2
| | | | | | | | This was a regression vs Python 3.4. Patch from Ignacio Rossi
* | Issue #23310: Fix MagicMock's initializer to work with __methods__.Łukasz Langa2015-04-141-2/+3
| | | | | | | | Behavior equivalent to m.configure_mock(). Patch by Kasia Jachim.
* | Issue #23568: Add rdivmod support to MagicMock() objects.Berker Peksag2015-03-141-1/+3
|\ \ | |/ | | | | Patch by Håkan Lövdahl.
| * Issue #23568: Add rdivmod support to MagicMock() objects.Berker Peksag2015-03-141-1/+3
| | | | | | | | Patch by Håkan Lövdahl.
* | Issue #23581: Add matmul support to MagicMock.Berker Peksag2015-03-121-1/+1
| | | | | | | | Patch by Håkan Lövdahl.
* | Issue #23326: Removed __ne__ implementations. Since fixing default __ne__Serhiy Storchaka2015-01-311-4/+0
| | | | | | | | implementation in issue #21408 they are redundant.
* | Issue #22823: Fix typo in unittest/mock.pyVictor Stinner2014-12-111-1/+1
| |
* | Issue #22823: Use set literals instead of creating a set from a list.Serhiy Storchaka2014-12-111-16/+15
| | | | | | | | Fixed an output of sets in examples.
* | Closes #21270 : We now override tuple methods in mock.call objects.Kushal Das2014-09-161-0/+6
| |
generated by cgit v0.12 at 2025-09-25 01:02:25 (GMT)