Staging
v0.8.1
v0.8.1
https://github.com/python/cpython
Revision 12b9fb603eea9298c835bae5b8742db4fa52892e authored by Miss Islington (bot) on 08 December 2018, 11:41:52 UTC, committed by Chris Withers on 08 December 2018, 11:41:52 UTC
* 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>
1 parent 2d6bc25
Tip revision: 12b9fb603eea9298c835bae5b8742db4fa52892e authored by Miss Islington (bot) on 08 December 2018, 11:41:52 UTC
bpo-35330: Don't call the wrapped object if `side_effect` is set (GH11034)
bpo-35330: Don't call the wrapped object if `side_effect` is set (GH11034)
Tip revision: 12b9fb6
| File | Mode | Size |
|---|---|---|
| NEWS.d | ||
| ACKS | -rw-r--r-- | 25.4 KB |
| HISTORY | -rw-r--r-- | 1.3 MB |
| Porting | -rw-r--r-- | 63 bytes |
| README | -rw-r--r-- | 1.4 KB |
| README.AIX | -rw-r--r-- | 5.0 KB |
| README.coverity | -rw-r--r-- | 845 bytes |
| README.valgrind | -rw-r--r-- | 4.5 KB |
| SpecialBuilds.txt | -rw-r--r-- | 10.0 KB |
| coverity_model.c | -rw-r--r-- | 4.1 KB |
| gdbinit | -rw-r--r-- | 4.7 KB |
| indent.pro | -rw-r--r-- | 557 bytes |
| python-config.in | -rw-r--r-- | 2.0 KB |
| python-config.sh.in | -rw-r--r-- | 2.9 KB |
| python-wing3.wpr | -rw-r--r-- | 555 bytes |
| python-wing4.wpr | -rw-r--r-- | 835 bytes |
| python-wing5.wpr | -rw-r--r-- | 835 bytes |
| python.man | -rw-r--r-- | 13.3 KB |
| python.pc.in | -rw-r--r-- | 293 bytes |
| svnmap.txt | -rw-r--r-- | 4.1 MB |
| valgrind-python.supp | -rw-r--r-- | 8.2 KB |
| vgrindefs | -rw-r--r-- | 500 bytes |
Computing file changes ...
