49e27f0afb
remove jython support from unittest.mock (GH#13033)
2019-05-01 08:48:44 +01:00
0df635c7f8
Don't report deleted attributes in __dir__ (GH#10148)
...
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).
2019-04-30 19:56:36 +01:00
9b21856b0f
bpo-23078: Add support for {class,static}method to mock.create_autospec() (GH-11613)
...
Co-authored-by: Felipe <felipe.nospam.ochoa@gmail.com>
2019-04-22 05:30:23 +03:00
830b43d03c
bpo-36593: Fix isinstance check for Mock objects with spec executed under 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 .
2019-04-13 20:12:33 +01:00
02b84cb1b4
bpo-36366: Return None on stopping unstarted patch object (GH-12472)
...
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
2019-03-28 14:08:43 -07:00
b0df45e55d
bpo-21269: Provide args and kwargs attributes on mock call objects GH11807
2019-03-22 08:10:40 +00:00
9c3f284de5
Autospec functions should propagate mock calls to parent GH-11273
2019-02-25 21:46:34 +00:00
a875ea58b2
bpo-35512: Resolve string target to patch.dict decorator during function 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
2019-02-24 18:54:49 +00:00
2bdd5858e3
bpo-35500: align expected and actual calls on mock.assert_called_with error message. (GH-11804)
2019-02-13 18:22:29 -08:00
222d303ade
bpo-20239: Allow repeated deletion of unittest.mock.Mock attributes ( #11057 )
...
* 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
2019-01-21 08:57:46 +00:00
71f82a2f20
Fix mock_open docstring to use readline ( #11176 )
2018-12-20 16:00:21 +00:00
f7fa62ef44
bpo-17185: Add __signature__ to mock that can be used by inspect for 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
2018-12-12 07:54:54 +00:00
f05df0a4b6
bpo-35330: Don't call the wrapped object if `side_effect` is set (GH10973)
...
* 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.
2018-12-08 11:25:02 +00:00
e63e617ebb
bpo-35357: Add _mock_ prefix to name/parent/from_kall attributes of _Call/_MagicProxy. ( #10873 )
...
Fix minor typo in test function name.
2018-12-04 09:08:45 +00:00
8ca0fa9d2f
bpo-35226: Fix equality for nested unittest.mock.call objects. ( #10555 )
...
Also refactor the call recording imolementation and add some notes
about its limitations.
2018-12-03 21:31:37 +00:00
edeca92c84
bpo-31177: Skip deleted attributes while calling reset_mock (GH-9302)
2018-12-01 11:03:54 +01:00
34fd4c2019
bpo-35133: Fix mistakes when concatenate string literals on different lines. (GH-10284)
...
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.
2018-11-05 16:20:25 +02:00
47d94241a3
bpo-35047, unittest.mock: Better error messages on assert_called_xxx failures (GH-10090)
...
unittest.mock now includes mock calls in exception messages if
assert_not_called, assert_called_once, or assert_called_once_with
fails.
2018-10-28 21:37:10 +01:00
6c83d9f4a7
bpo-35022: unittest.mock.MagicMock now also supports __fspath__ (GH-9960)
...
The MagicMock class supports many magic methods, but not __fspath__. To ease
testing with modules such as os.path, this function is now supported by default.
2018-10-25 23:48:58 +02:00
96200eb2ff
unittest.mock doc: Fix references to recursive seal of Mocks (GH-9028)
...
The docs in `library/unittest.mock` have been updated to remove
confusing terms about submock and be explicit about the behavior
expected.
2018-10-19 23:57:37 +02:00
2087023fde
bpo-32933: Implement __iter__ method on mock_open() (GH-5974)
2018-09-13 01:21:16 +03:00
2b32da2fea
Improve error message when mock.assert_has_calls fails (GH-8205)
...
This makes the assertion error message more useful, aiding debugging.
Thanks @davidair!
2018-08-17 12:09:58 -07:00
9d6d06e806
pypi.python.org -> pypi.org (GH-7613)
2018-06-11 00:45:50 -04:00
6c4fab0f4b
bpo-33516: Add support for __round__ in MagicMock (GH-6880)
...
unittest.mock.MagicMock now supports the __round__() magic method.
2018-05-22 22:01:10 +02:00
552be9d7e6
bpo-30541: Add new method to seal mocks (GH61923)
...
The new method allows the developer to control when to stop the
feature of mocks that automagically creates new mocks when accessing
an attribute that was not declared before
Signed-off-by: Mario Corchero <mariocj89@gmail.com>
2017-10-17 04:35:11 -07:00
856cbcc12f
bpo-29403: Fix mock's broken autospec behavior on method-bound builtin 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.
2017-07-20 03:01:14 +03:00
324c5d8ca6
bpo-28911: Clarify the behaviour of assert_called_once_with. ( #251 )
2017-02-23 15:57:25 +01:00
19dea2c726
Issue #28735 : Fixed the comparison of mock.MagickMock with mock.ANY.
2017-01-21 23:17:25 +02:00
a203360836
Issue #28735 : Fixed the comparison of mock.MagickMock with mock.ANY.
2017-01-21 23:15:18 +02:00
362f058a89
Issue #28735 : Fixed the comparison of mock.MagickMock with mock.ANY.
2017-01-21 23:12:58 +02:00
d9c956fb23
Issue #20804 : The unittest.mock.sentinel attributes now preserve their
...
identity when they are copied or pickled.
2017-01-11 20:13:03 +02:00
cd992bbe73
Merge 3.6
2017-01-06 18:16:07 +01:00
84b6fb0eea
Fix unittest.mock._Call: don't ignore name
...
Issue #28961 : Fix unittest.mock._Call helper: don't ignore the name parameter
anymore.
Patch written by Jiajun Huang.
2017-01-06 18:15:51 +01:00
161a4dd495
Issue #28919 : Simplify _copy_func_details() in unittest.mock
...
Patch by Jiajun Huang.
2016-12-15 05:21:44 +03:00
ac5084b6c7
Fixes issue28380: unittest.mock Mock autospec functions now properly support
...
assert_called, assert_not_called, and assert_called_once.
2016-10-06 14:31:23 -07:00
c35a32fe85
Issue #26750 : use inspect.isdatadescriptor instead of our own
...
_is_data_descriptor().
2016-08-15 23:56:32 -07:00
d4583d7fea
Issue #26750 : use inspect.isdatadescriptor instead of our own
...
_is_data_descriptor().
2016-08-15 23:23:40 -07:00
d0d24fd1ae
Issue #26750 : unittest.mock.create_autospec() now works properly for
...
subclasses of property() and other data descriptors. Removes the never
publicly used, never documented unittest.mock.DescriptorTypes tuple.
2016-08-07 09:06:27 -07:00
9854789efe
Issue #26750 : unittest.mock.create_autospec() now works properly
...
for subclasses of property() and other data descriptors.
2016-08-07 08:52:26 -07:00
702f4f5d6f
Issue #23804 : Merge spelling and NEWS fixes from 3.5
2016-07-11 12:54:44 +00:00
204bf0b9ae
English spelling and grammar fixes
2016-07-11 07:51:37 +00:00
6c85091b5b
Issue #23641 : Added __getnewargs_ex__ to the list of special mock attributes.
2016-06-19 18:32:07 +03:00
5943ea76d5
Issue #23641 : Added __getnewargs_ex__ to the list of special mock attributes.
2016-06-19 18:30:43 +03:00
9cd39a170b
Issue #21271 : Adds new keyword only parameters in reset_mock call
...
We now have two keyword only parameters in the reset_mock function to
selectively reset the return_value or the side_effects, or both.
2016-06-02 10:20:16 -07:00
c85dd85f1a
Issue #26807 : mock_open 'files' no longer error on readline at end of file.
...
Patch from Yolanda Robla.
2016-05-16 15:22:45 +12:00
9549a3e3d4
Issue #26807 : mock_open 'files' no longer error on readline at end of file.
...
Patch from Yolanda Robla.
2016-05-16 15:22:01 +12:00
5a6c018b57
Issue #25195 : Fix a regression in mock.MagicMock
...
_Call is a subclass of tuple (changeset 3603bae63c13 only works
for classes) so we need to implement __ne__ ourselves.
Patch by Andrew Plummer.
2016-03-28 00:30:40 +03:00
ce913877e4
Issue #25195 : Fix a regression in mock.MagicMock
...
_Call is a subclass of tuple (changeset 3603bae63c13 only works
for classes) so we need to implement __ne__ ourselves.
Patch by Andrew Plummer.
2016-03-28 00:30:02 +03:00
2c2a4e63d7
Add Mock.assert_called()
...
Issue #26323 : Add assert_called() and assert_called_once() methods to
unittest.mock.Mock.
2016-03-11 22:17:48 +01:00
121edbf7e2
Issue25347 - Format the error message output of mock's assert_has_calls method.
...
Patch contributed by Robert Zimmerman.
2016-01-12 06:18:32 -08:00
81bc927da7
Issue #22138 : Fix mock.patch behavior when patching descriptors. Restore
...
original values after patching.
Patch contributed by Sean McCully.
2016-01-08 23:43:29 -08:00
29bf4d403d
Issue #24857 : Comparing call_args to a long sequence now correctly returns a
...
boolean result instead of raising an exception.
Patch by A Kaptur.
2015-09-09 23:39:45 +03:00
3fc536f1c9
Issue #24857 : Comparing call_args to a long sequence now correctly returns a
...
boolean result instead of raising an exception.
Patch by A Kaptur.
2015-09-09 23:35:25 +03:00
86b34da5ef
Issue #23004 : mock_open() now reads binary data correctly when the type of read_data is bytes.
...
Initial patch by Aaron Hill.
2015-08-06 13:15:51 +03:00
ca647ef60a
Issue #21750 : Further fixup to be styled like other mock APIs.
2015-07-24 03:48:20 +12:00
92b3e06517
Typo fix in mock.patch.
...
Patch from https://github.com/testing-cabal/mock/issues/215
2015-07-17 21:58:36 +12:00
5329aaa74b
Issue #21750 : mock_open.read_data can now be read from each instance, as it
...
could in Python 3.3.
2015-07-17 20:08:45 +12:00
b37f43f94b
- Issue #18622 : unittest.mock.mock_open().reset_mock would recurse infinitely.
...
Patch from Nicola Palumbo and Laurent De Buyst.
2015-07-15 11:42:28 +12:00
abfaecdfdd
Issue #23004 : mock_open() now reads binary data correctly when the type of read_data is bytes.
...
Initial patch by Aaron Hill.
2015-08-06 13:16:52 +03:00
88ba360c88
Issue #21750 : Further fixup to be styled like other mock APIs.
2015-07-24 03:48:45 +12:00
1a80081272
Typo fix in mock.patch.
...
Patch from https://github.com/testing-cabal/mock/issues/215
2015-07-17 22:00:28 +12:00
4838717b53
Issue #21750 : mock_open.read_data can now be read from each instance, as it
...
could in Python 3.3.
2015-07-17 20:10:23 +12:00
76d508b5d4
- Issue #18622 : unittest.mock.mock_open().reset_mock would recurse infinitely.
...
Patch from Nicola Palumbo and Laurent De Buyst.
2015-07-15 11:49:43 +12:00
f58f88c4c7
Issue #23661 : unittest.mock side_effects can now be exceptions again.
...
This was a regression vs Python 3.4. Patch from Ignacio Rossi
2015-07-14 13:51:40 +12:00
a468db9b0b
Issue #23310 : Fix MagicMock's initializer to work with __methods__.
...
Behavior equivalent to m.configure_mock(). Patch by Kasia Jachim.
2015-04-13 23:12:42 -07:00
5f6684efe0
Issue #23310 : Fix MagicMock's initializer to work with __methods__.
...
Behavior equivalent to m.configure_mock(). Patch by Kasia Jachim.
2015-04-14 00:12:57 -07:00
7aaa85932c
Issue #23568 : Add rdivmod support to MagicMock() objects.
...
Patch by Håkan Lövdahl.
2015-03-15 01:57:38 +02:00
a785dece57
Issue #23568 : Add rdivmod support to MagicMock() objects.
...
Patch by Håkan Lövdahl.
2015-03-15 01:51:56 +02:00
9bd8af788d
Issue #23581 : Add matmul support to MagicMock.
...
Patch by Håkan Lövdahl.
2015-03-12 20:42:48 +02:00
08448a1f4d
Issue #23326 : Removed __ne__ implementations. Since fixing default __ne__
...
implementation in issue #21408 they are redundant.
2015-01-31 12:05:05 +02:00
eb1a995a7c
Issue #22823 : Fix typo in unittest/mock.py
2014-12-11 22:25:49 +01:00
c02d188a84
Issue #22823 : Use set literals instead of creating a set from a list.
...
Fixed an output of sets in examples.
2014-12-11 10:28:14 +02:00
a37b958d65
Closes #21270 : We now override tuple methods in mock.call objects.
2014-09-16 18:33:37 +05:30
047f14c3c6
Closes #21256 : Printout of keyword args in deterministic order in mock calls.
...
Printout of keyword args should be in deterministic order in
a mock function call. This will help to write better doctests.
2014-06-09 13:45:56 +05:30
ebc1a30d55
Closes issue 21239. unittest.mock.patch.stopall() did not work deterministically when the same name was patched multiple times.
2014-04-15 17:21:08 -04:00
484f8a875b
Closes Issue 21222.
...
Passing name keyword argument to mock.create_autospec now works.
2014-04-16 01:05:50 +05:30
68290f4895
Removes unused varargs and varkwargs from assert_not_called().
2014-04-17 01:54:07 +05:30
8af9db3e4f
Closes Issue 21262: New method assert_not_called for Mock.
...
It raises AssertionError if the mock has been called.
2014-04-17 01:36:14 +05:30
8c14534df6
Closes Issue 21238: New keyword argument `unsafe` to Mock.
...
It raises `AttributeError` incase of an attribute startswith assert
or assret.
2014-04-16 23:32:21 +05:30
15f2d1775e
Merge
2014-04-15 17:22:22 -04:00
5d1f6c3b15
Merge
2014-04-16 01:22:52 +05:30
fddcfa27fa
Closes issue 17660. You no longer need to explicitly pass create=True when patching builtin names.
2014-04-14 16:25:20 -04:00
01bafdcccc
Issue 17826. Setting an iterable side_effect on a mock created by create_autospec now works
2014-04-14 16:09:42 -04:00
d2623d7786
Issue 20968. unittest.mock.MagicMock now supports division
2014-04-14 11:23:48 -04:00
5c66189e88
Issue #20189 : Four additional builtin types (PyTypeObject,
...
PyMethodDescr_Type, _PyMethodWrapper_Type, and PyWrapperDescr_Type)
have been modified to provide introspection information for builtins.
Also: many additional Lib, test suite, and Argument Clinic fixes.
2014-01-24 06:17:25 -08:00
8ab1e513c1
Process DEFAULT values in mock side_effect that returns iterator.
...
Patch by Michael Ford.
2013-04-07 16:44:07 +03:00
8b2cd75bdd
Process DEFAULT values in mock side_effect that returns iterator.
...
Patch by Michael Ford.
2013-04-07 16:42:24 +03:00
89e6b31845
#17504 : merge with 3.3.
2013-03-24 16:10:51 +02:00
31a7835df8
#17504 : remove duplicated sentence. Patch by Radu Voicilas.
2013-03-24 16:10:24 +02:00
04cbe0c35b
Closes issue 17467. Add readline and readlines support to unittest.mock.mock_open
2013-03-19 17:22:51 -07:00
8b53559a89
Merge with 3.3, issue #17047 : remove doubled words added in 3.3,
...
as reported by Serhiy Storchaka and Matthew Barnett.
2013-03-11 18:36:38 -04:00
0f84764a09
Issue #17047 : remove doubled words added in 3.3
...
as reported by Serhiy Storchaka and Matthew Barnett.
2013-03-11 18:34:00 -04:00
5c64df70b5
Issue #17015 : When it has a spec, a Mock object now inspects its signature when matching calls, so that arguments can be matched positionally or by name.
2013-02-03 00:23:58 +01:00
28d591ceef
Closes issue 15323. Improve failure message of Mock.assert_called_once_with
2012-09-28 16:15:22 +01:00
f7c4158057
Adding patch.stopall method to unittest.mock
2012-06-10 20:36:32 +01:00
75963643b1
Fix exception when calling reset_mock on a mock created with autospec
2012-06-09 17:31:59 +01:00
0b43bcf528
Close #14857 : fix regression in references to PEP 3135 implicit __class__ closure variable. Reopens issue #12370 , but also updates unittest.mock to workaround that issue
2012-05-27 18:17:07 +10:00
9cf5c9d85e
Remove incorrect comment
2012-04-21 18:32:56 +01:00
3af125a4aa
Closes issue 14634. unittest.mock.create_autospec now supports keyword only arguments.
2012-04-21 18:22:28 +01:00
2cd48738ba
Closes issue 14636. mock objects raise exceptions from an iterable side_effect
2012-04-21 15:52:11 +01:00
Chris Withers
Mario Corchero
Xtreak
Kumar Akshay
Susan Su
Pablo Galindo
Xtreak
Andrew Dunai
Serhiy Storchaka
Petter Strandmark
Max Bélanger
Tony Flury
davidair
Ned Deily
John Reese
Aaron Gallagher
Arne de Laat
Victor Stinner
Berker Peksag
Gregory P. Smith
Martin Panter
Kushal Das
Robert Collins
Senthil Kumaran
Łukasz Langa
Michael Foord
Larry Hastings
Andrew Svetlov
Ezio Melotti
Terry Jan Reedy
Antoine Pitrou
Nick Coghlan