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

refactor: Limit scope of approx sequences to list and tuple

This commit is contained in:
Zach OBrien 2022-06-12 17:49:46 -04:00
parent 843ad11bab
commit ab2a971575
No known key found for this signature in database
GPG Key ID: 7AA939E250324125
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/_pytest/python_api.py
View File

@ -135,8 +135,8 @@ class ApproxBase:
def _recursive_sequence_map(f, x): def _recursive_sequence_map(f, x):
"""Recursively map a function over a sequence of arbitary depth""" """Recursively map a function over a sequence of arbitary depth"""
if isinstance(x, Sequence):
seq_type = type(x) seq_type = type(x)
if seq_type in (list, tuple):
return seq_type(_recursive_sequence_map(f, xi) for xi in x) return seq_type(_recursive_sequence_map(f, xi) for xi in x)
else: else:
return f(x) return f(x)

32
testing/python/approx.py
View File

@ -147,20 +147,6 @@ class TestApprox:
], ],
) )
assert_approx_raises_regex(
range(0, 3),
range(1, 4),
[
r" comparison failed. Mismatched elements: 3 / 3:",
rf" Max absolute difference: {SOME_FLOAT}",
rf" Max relative difference: {SOME_FLOAT}",
r" Index \| Obtained\s+\| Expected ",
rf" 0 \| {SOME_FLOAT} \| {SOME_FLOAT} ± {SOME_FLOAT}",
rf" 1 \| {SOME_FLOAT} \| {SOME_FLOAT} ± {SOME_FLOAT}",
rf" 2 \| {SOME_FLOAT} \| {SOME_FLOAT} ± {SOME_FLOAT}",
],
)
# Specific test for comparison with 0.0 (relative diff will be 'inf') # Specific test for comparison with 0.0 (relative diff will be 'inf')
assert_approx_raises_regex( assert_approx_raises_regex(
[0.0], [0.0],
@ -912,11 +898,25 @@ class TestRecursiveSequenceMap:
def test_map_over_scalar(self): def test_map_over_scalar(self):
assert _recursive_sequence_map(sqrt, 16) == 4 assert _recursive_sequence_map(sqrt, 16) == 4
def test_map_over_empty_list(self):
assert _recursive_sequence_map(sqrt, []) == []
def test_map_over_list(self): def test_map_over_list(self):
assert _recursive_sequence_map(sqrt, [4, 16, 25, 676]) == [2, 4, 5, 26] assert _recursive_sequence_map(sqrt, [4, 16, 25, 676]) == [2, 4, 5, 26]
def test_map_over_tuple(self): def test_map_over_tuple(self):
assert _recursive_sequence_map(sqrt, (4, 16, 25, 676)) == (2, 4, 5, 26) assert _recursive_sequence_map(sqrt, (4, 16, 25, 676)) == (2, 4, 5, 26)
def test_map_over_range(self): def test_map_over_nested_lists(self):
assert _recursive_sequence_map(lambda x: 2 * x, range(0, 5)) == range(0, 9, 2) assert _recursive_sequence_map(sqrt, [4, [25, 64], [[49]]]) == [
2,
[5, 8],
[[7]],
]
def test_map_over_mixed_sequence(self):
assert _recursive_sequence_map(sqrt, [4, (25, 64), [(49)]]) == [
2,
(5, 8),
[(7)],
]