floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reflect dimension in approx repr for numpy arrays.

This commit is contained in:
Kale Kundert 2018-07-30 23:22:06 -07:00
parent 253419316c
commit 7d8688d54b
No known key found for this signature in database
GPG Key ID: C6238221D17CAFAE
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/_pytest/python_api.py
View File

@ -82,14 +82,18 @@ class ApproxNumpy(ApproxBase):
""" """
def __repr__(self): def __repr__(self):
# It might be nice to rewrite this function to account for the
# shape of the array...
import numpy as np import numpy as np
list_scalars = [] def recursive_map(f, x):
for x in np.ndindex(self.expected.shape): if isinstance(x, list):
list_scalars.append(self._approx_scalar(np.asscalar(self.expected[x]))) return list(recursive_map(f, xi) for xi in x)
else:
return f(x)
list_scalars = recursive_map(
self._approx_scalar,
self.expected.tolist())
return "approx({!r})".format(list_scalars) return "approx({!r})".format(list_scalars)
if sys.version_info[0] == 2: if sys.version_info[0] == 2:

22
testing/python/approx.py
View File

@ -59,17 +59,19 @@ class TestApprox(object):
), ),
) )
def test_repr_0d_array(self, plus_minus): def test_repr_nd_array(self, plus_minus):
# Make sure that arrays of all different dimensions are repr'd
# correctly.
np = pytest.importorskip("numpy") np = pytest.importorskip("numpy")
np_array = np.array(5.) examples = [
assert approx(np_array) == 5.0 (np.array(5.), 'approx(5.0 {pm} 5.0e-06)'),
string_expected = "approx([5.0 {} 5.0e-06])".format(plus_minus) (np.array([5.]), 'approx([5.0 {pm} 5.0e-06])'),
(np.array([[5.]]), 'approx([[5.0 {pm} 5.0e-06]])'),
assert repr(approx(np_array)) == string_expected (np.array([[5., 6.]]), 'approx([[5.0 {pm} 5.0e-06, 6.0 {pm} 6.0e-06]])'),
(np.array([[5.], [6.]]), 'approx([[5.0 {pm} 5.0e-06], [6.0 {pm} 6.0e-06]])'),
np_array = np.array([5.]) ]
assert approx(np_array) == 5.0 for np_array, repr_string in examples:
assert repr(approx(np_array)) == string_expected assert repr(approx(np_array)) == repr_string.format(pm=plus_minus)
def test_operator_overloading(self): def test_operator_overloading(self):
assert 1 == approx(1, rel=1e-6, abs=1e-12) assert 1 == approx(1, rel=1e-6, abs=1e-12)