p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3761 from nicoddemus/numpy-recursion-error 

Fix recursion in pytest.approx() with arrays in numpy<1.13
This commit is contained in:
Bruno Oliveira 2018-08-01 23:40:30 -03:00 committed by GitHub
parent 804fc4063a b8255308d6
commit 5db2e6c7a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/3748.bugfix.rst Normal file
View File

@ -0,0 +1 @@
Fix infinite recursion in ``pytest.approx`` with arrays in ``numpy<1.13``.

4
src/_pytest/python_api.py
View File

@ -257,7 +257,9 @@ class ApproxScalar(ApproxBase):
the pre-specified tolerance.
"""
if _is_numpy_array(actual):
return all(a == self for a in actual.flat)
# Call ``__eq__()`` manually to prevent infinite-recursion with
# numpy<1.13. See #3748.
return all(self.__eq__(a) for a in actual.flat)
# Short-circuit exact equality.
if actual == self.expected: