summaryrefslogtreecommitdiffstats
path: root/Lib/unittest/mock.py
Commit message (Collapse)AuthorAgeFilesLines
* [3.8] bpo-40126: Fix reverting multiple patches in unittest.mock. (GH-19351) ↵Serhiy Storchaka2020-04-121-46/+24
| | | | | | | | | (GH-19483) Patcher's __exit__() is now never called if its __enter__() is failed. Returning true from __exit__() silences now the exception. (cherry picked from commit 4b222c9491d1700e9bdd98e6889b8d0ea1c7321e) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
* bpo-39915: Ensure await_args_list is updated according to the order in which ↵Miss Islington (bot)2020-03-141-1/+1
| | | | | | | | coroutines were awaited (GH-18927) Create call objects with awaited arguments instead of using call_args which has only last call value. (cherry picked from commit e553f204bf0e39b1d701a364bc71b286acb9433f) Co-authored-by: Karthikeyan Singaravelan <tir.karthi@gmail.com>
* bpo-39485: fix corner-case in method-detection of mock (GH-18255)Miss Islington (bot)2020-01-291-5/+1
| | | | | | | | | | | | | | | | | | | | Replace check for whether something is a method in the mock module. The previous version fails on PyPy, because there no method wrappers exist (everything looks like a regular Python-defined function). Thus the isinstance(getattr(result, '__get__', None), MethodWrapperTypes) check returns True for any descriptor, not just methods. This condition could also return erroneously True in CPython for C-defined descriptors. Instead to decide whether something is a method, just check directly whether it's a function defined on the class. This passes all tests on CPython and fixes the bug on PyPy. (cherry picked from commit a327677905956ae0b239ff430a1346dfe265709e) Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz@gmx.de> Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz@gmx.de>
* [3.8] bpo-39082: Allow AsyncMock to correctly patch static/class methods ↵Matthew Kokotovich2020-01-261-0/+2
| | | | | | | (GH-18190) (cherry picked from commit 62865f4532094017a9b780b704686ca9734bc329) Co-authored-by: Matthew Kokotovich <mkokotovich@gmail.com>
* bpo-38473: Handle autospecced functions and methods used with attach_mock ↵Miss Islington (bot)2020-01-251-0/+4
| | | | | | | | | | | (GH-16784) (GH-18167) If an autospecced object is attached using attach_mock the child would be a function with mock object as attribute from which signature has to be derived. (cherry picked from commit 66b00a9d3aacf6ed49412f48743e4913104a2bb3) Co-authored-by: Karthikeyan Singaravelan <tir.karthi@gmail.com>
* bpo-38669: patch.object now raises a helpful error (GH17510)Miss Islington (bot)2019-12-091-0/+4
| | | | | | This means a clearer message is now shown when patch.object is called with two string arguments, rather than a class and a string argument. (cherry picked from commit cd90a52983db34896a6335a572d55bdda274778f) Co-authored-by: Elena Oat <oat.elena@gmail.com>
* [3.8] bpo-38857: AsyncMock fix for awaitable values and StopIteration fix ↵Lisa Roach2019-11-211-25/+37
| | | | | | | [3.8] (GH-17269) (#17304) (cherry picked from commit 046442d02bcc6e848e71e93e47f6cde9e279e993) Co-authored-by: Jason Fried <fried@fb.com>
* [3.8] bpo-38163: Child mocks detect their type as sync or async (GH-16471) ↵Lisa Roach2019-09-301-2/+3
| | | | (GH-16484)
* bpo-38161: Removes _AwaitEvent from AsyncMock. (GH-16443) (GH-16481)Miss Islington (bot)2019-09-301-36/+0
|
* bpo-38108: Makes mock objects inherit from Base (GH-16060) (GH-16470)Miss Islington (bot)2019-09-301-36/+19
|
* [3.8] bpo-38136: Updates await_count and call_count to be different things ↵Lisa Roach2019-09-271-0/+10
| | | | (GH-16192) (GH-16431)
* [3.8] bpo-36871: Handle spec errors in assert_has_calls (GH-16005) (GH-16364)Miss Islington (bot)2019-09-251-5/+21
| | | | | | | | | | | | | | | | | | | | | | | The fix in PR 13261 handled the underlying issue about the spec for specific methods not being applied correctly, but it didn't fix the issue that was causing the misleading error message. The code currently grabs a list of responses from _call_matcher (which may include exceptions). But it doesn't reach inside the list when checking if the result is an exception. This results in a misleading error message when one of the provided calls does not match the spec. https://bugs.python.org/issue36871 Automerge-Triggered-By: @gpshead (cherry picked from commit b5a7a4f0c20717a4c92c371583b5521b83f40f32) Co-authored-by: Samuel Freilich <sfreilich@google.com> https://bugs.python.org/issue36871 Automerge-Triggered-By: @gpshead
* [3.8] bpo-38093: Correctly returns AsyncMock for async subclasses. ↵Lisa Roach2019-09-211-6/+12
| | | | | | | | (GH-15947) (GH-16299) (cherry picked from commit 8b03f943c37e07fb2394acdcfacd066647f9b1fd) Co-authored-by: Lisa Roach <lisaroach14@gmail.com>
* bpo-37828: Fix default mock_name in unittest.mock.assert_called error (GH-16166)Miss Islington (bot)2019-09-171-1/+1
| | | | | | In the format string for assert_called the evaluation order is incorrect and hence for mock's without name, 'None' is printed whereas it should be 'mock' like for other messages. The error message is ("Expected '%s' to have been called." % self._mock_name or 'mock'). (cherry picked from commit 5f5f11faf9de0d8dcbe1a8a4eb35d2a4232d6eaa) Co-authored-by: Abraham Toriz Cruz <awonderfulcode@gmail.com>
* bpo-38100: Fix spelling error in unittest.mock code (GH-16168)Miss Islington (bot)2019-09-161-3/+3
| | | | | (cherry picked from commit a9187c31185fe7ea47271839898416400cc3d976) Co-authored-by: marcoramirezmx <55331462+marcoramirezmx@users.noreply.github.com>
* bpo-37972: unittest.mock._Call now passes on __getitem__ to the __getattr__ ↵Miss Islington (bot)2019-09-121-0/+6
| | | | | | | | | | | | | | | | | | chaining so that call() can be subscriptable (GH-15565) (GH-15965) * bpo-37972: unittest.mock._Call now passes on __getitem__ to the __getattr__ chaining so that call() can be subscriptable * 📜🤖 Added by blurb_it. * Update 2019-08-28-21-40-12.bpo-37972.kP-n4L.rst added name of the contributor * bpo-37972: made all dunder methods chainable for _Call * bpo-37972: delegate only attributes of tuple instead to __getattr__ (cherry picked from commit 72c359912d36705a94fca8b63d80451905a14ae4) Co-authored-by: blhsing <github@ydooby.com>
* bpo-37251: Removes __code__ check from _is_async_obj. (GH-15830)Miss Islington (bot)2019-09-101-3/+2
| | | | | (cherry picked from commit f1a297acb60b88917712450ebd3cfa707e6efd6b) Co-authored-by: Lisa Roach <lisaroach14@gmail.com>
* docs: Add references to AsyncMock in unittest.mock.patch (GH-13681)Miss Islington (bot)2019-09-101-4/+5
| | | | | | | Update the docs as patch can now return an AsyncMock if the patched object is an async function. (cherry picked from commit f5e7f39d2916ed150e80381faed125f405a11e11) Co-authored-by: Mario Corchero <mcorcherojim@bloomberg.net>
* bpo-37212: Preserve keyword argument order in unittest.mock.call and error ↵Miss Islington (bot)2019-09-091-1/+1
| | | | | | | messages (GH-14310) (cherry picked from commit 9d607061c9c888913ae2c18543775cf360d55f27) Co-authored-by: Xtreak <tir.karthi@gmail.com>
* bpo-36743: __get__ is sometimes called without the owner argument (GH-12992) ↵Miss Islington (bot)2019-08-291-1/+1
| | | | | | | (GH-15589) (cherry picked from commit 0dac68f1e593c11612ed54af9edb865d398f3b05) Co-authored-by: Raymond Hettinger <rhettinger@users.noreply.github.com>
* bpo-36871: Ensure method signature is used when asserting mock calls to a ↵Miss Islington (bot)2019-08-291-1/+35
| | | | | | | | | | | | | | | | | | method (GH15578) * Fix call_matcher for mock when using methods * Add NEWS entry * Use None check and convert doctest to unittest * Use better name for mock in tests. Handle _SpecState when the attribute was not accessed and add tests. * Use reset_mock instead of reinitialization. Change inner class constructor signature for check * Reword comment regarding call object lookup logic (cherry picked from commit c96127821ebda50760e788b1213975a0d5bea37f) Co-authored-by: Xtreak <tir.karthi@gmail.com>
* bpo-35946: Improve assert_called_with documentation (GH-11796)Miss Islington (bot)2019-08-291-1/+1
| | | | | (cherry picked from commit f5896a05edf5df91fb1b55bd481ba5b2a3682f4e) Co-authored-by: Rémi Lapeyre <remi.lapeyre@henki.fr>
* bpo-21478: Record calls to parent when autospecced objects are used as child ↵Miss Islington (bot)2019-07-221-11/+16
| | | | | | | | | | | | | | | | with attach_mock (GH 14688) (GH-14902) * Clear name and parent of mock in autospecced objects used with attach_mock * Add NEWS entry * Fix reversed order of comparison * Test child and standalone function calls * Use a helper function extracting mock to avoid code duplication and refactor tests. (cherry picked from commit 7397cda99795a4a8d96193d710105e77a07b7411) Co-authored-by: Xtreak <tir.karthi@gmail.com>
* bpo-37116: Use PEP 570 syntax for positional-only parameters. (GH-13700)Serhiy Storchaka2019-06-011-48/+34
|
* bpo-37075: Fix string concatenation in assert_has_awaits error message ↵Xtreak2019-05-291-5/+5
| | | | | | | | | | (GH-13616) * Fix the implicit string concatenation in `assert_has_awaits` error message. * Use "await" instead of "call" in `assert_awaited_with` error message. https://bugs.python.org/issue37075
* bpo-32299: Return patched dict when using patch.dict as a context manager ↵Mario Corchero2019-05-281-0/+1
| | | | | | (GH-11062)
* bpo-36996: Handle async functions when mock.patch is used as a decorator ↵Xtreak2019-05-281-27/+57
| | | | | | | | | | (GH-13562) Return a coroutine while patching async functions with a decorator. Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com> https://bugs.python.org/issue36996
* bpo-37047: Refactor AsyncMock setup logic for autospeccing (GH-13574)Xtreak2019-05-271-21/+38
| | | | Handle late binding and attribute access in unittest.mock.AsyncMock setup for autospeccing.
* bpo-37008: make mock_open handle able to honor next() (GH-13492)Damien Nadé2019-05-231-0/+6
| | | | | | | | I've reported the issue on https://bugs.python.org/issue37008 and now I'm trying to bring a solution to this minor issue. I think it could be trivially backported to 3.7 branch. https://bugs.python.org/issue37008
* Fix RuntimeWarning in unittest.mock asyncio example (GH-13449)Xtreak2019-05-211-1/+1
| | | | * This PR fixes the `RuntimeWarning` in `inspect.isawaitable(mock())` where `mock()` was not awaited. * Fix typo in asynctest project.
* bpo-26467: Adds AsyncMock for asyncio Mock library support (GH-9296)Lisa Roach2019-05-201-17/+389
|
* bpo-24758: Improve the error msg for unittest.mock.Mock()'s unsafe mode (#12991)Zackery Spytz2019-05-081-1/+2
| | | | | | * bpo-24758: Improve the error msg for unittest.mock.Mock()'s unsafe mode * Make the requested changes.
* bpo-31855: unittest.mock.mock_open() results now respects the argument of ↵Rémi Lapeyre2019-05-071-25/+14
| | | | | | | | read([size]) (GH-11521) unittest.mock.mock_open() results now respects the argument of read([size]) Co-Authored-By: remilapeyre <remi.lapeyre@henki.fr>
* Mock 100% coverage (GH-13045)Chris Withers2019-05-011-56/+5
| | | | | | | | | | | This was achieved by: * moving many pass statements in tests onto their own lines, so they pass line coverage and can match an easy ignore pattern if branch coverage is added later. * removing code that cannot be reached. * removing long-disabled tests. * removing unused code. * adding tests for uncovered code It turned out that removing `if __name__ == '__main__'` blocks that run unittest.main() at the bottom of test files was surprisingly contentious, so they remain and can be filtered out with an appropriate .coveragerc.
* remove jython support from unittest.mock (GH#13033)Chris Withers2019-05-011-9/+2
|
* Don't report deleted attributes in __dir__ (GH#10148)Mario Corchero2019-04-301-2/+4
| | | | | | When an attribute is deleted from a Mock, a sentinel is added rather than just deleting the attribute. This commit checks for such sentinels when returning the child mocks in the __dir__ method as users won't expect deleted attributes to appear when performing dir(mock).
* bpo-23078: Add support for {class,static}method to mock.create_autospec() ↵Xtreak2019-04-221-1/+3
| | | | | (GH-11613) Co-authored-by: Felipe <felipe.nospam.ochoa@gmail.com>
* bpo-36593: Fix isinstance check for Mock objects with spec executed under ↵Xtreak2019-04-131-1/+1
| | | | | tracing (GH-12790) In Python having a trace function in effect while mock is imported causes isinstance to be wrong for MagicMocks. This is due to the usage of super() in some class methods, as this sets the __class__ attribute. To avoid this, as a workaround, alias the usage of super .
* bpo-36366: Return None on stopping unstarted patch object (GH-12472)Xtreak2019-03-281-1/+1
| | | | | | Return None after calling unittest.mock.patch.object.stop() regardless of whether the object was started. This makes the method idempotent. https://bugs.python.org/issue36366
* bpo-21269: Provide args and kwargs attributes on mock call objects GH11807Kumar Akshay2019-03-221-0/+16
|
* Autospec functions should propagate mock calls to parent GH-11273Xtreak2019-02-251-0/+8
|
* bpo-35512: Resolve string target to patch.dict decorator during function ↵Xtreak2019-02-241-2/+2
| | | | | | | | | | | | | | call GH#12000 * Resolve string target to patch.dict during function call * Add NEWS entry * Remove unneeded call * Restore original value for support.target and refactor assertions * Add extra assertion to verify unpatched dict
* bpo-35500: align expected and actual calls on mock.assert_called_with error ↵Susan Su2019-02-141-2/+5
| | | | message. (GH-11804)
* bpo-20239: Allow repeated deletion of unittest.mock.Mock attributes (#11057)Pablo Galindo2019-01-211-4/+3
| | | | | | | | * Allow repeated deletion of unittest.mock.Mock attributes * fixup! Allow repeated deletion of unittest.mock.Mock attributes * fixup! fixup! Allow repeated deletion of unittest.mock.Mock attributes
* Fix mock_open docstring to use readline (#11176)Xtreak2018-12-201-1/+1
|
* bpo-17185: Add __signature__ to mock that can be used by inspect for ↵Xtreak2018-12-121-2/+4
| | | | | | | | | | | | | | | | signature (GH11048) * Fix partial and partial method signatures in mock * Add more calls * Add NEWS entry * Use assertEquals and fix markup in NEWS * Refactor branching and add markup reference for functools * Revert partial object related changes and fix pr comments
* bpo-35330: Don't call the wrapped object if `side_effect` is set (GH10973)Mario Corchero2018-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.
* bpo-35357: Add _mock_ prefix to name/parent/from_kall attributes of ↵Andrew Dunai2018-12-041-14/+14
| | | | | _Call/_MagicProxy. (#10873) Fix minor typo in test function name.
* bpo-35226: Fix equality for nested unittest.mock.call objects. (#10555)Chris Withers2018-12-031-23/+32
| | | | Also refactor the call recording imolementation and add some notes about its limitations.
* bpo-31177: Skip deleted attributes while calling reset_mock (GH-9302)Xtreak2018-12-011-1/+1
|
generated by cgit v0.12 at 2025-09-17 11:08:22 (GMT)