Skip to content

Commit f392f6f

Browse files
authored
Merge pull request #43 from pllim/fix-single-ref
Fix single_reference=True
2 parents ebafbeb + 86e919e commit f392f6f

File tree

4 files changed

+28
-2
lines changed

4 files changed

+28
-2
lines changed

CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
0.7 (unreleased)
22
----------------
33

4+
- Fix broken ``single_reference=True`` usage. [#43]
5+
46
0.6 (2023-11-15)
57
----------------
68

pytest_arraydiff/plugin.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,10 @@ def pytest_runtest_call(self, item):
310310
# Find test name to use as plot name
311311
filename = compare.kwargs.get('filename', None)
312312
if filename is None:
313-
filename = item.name + '.' + extension
314-
if not single_reference:
313+
if single_reference:
314+
filename = item.originalname + '.' + extension
315+
else:
316+
filename = item.name + '.' + extension
315317
filename = filename.replace('[', '_').replace(']', '_')
316318
filename = filename.replace('_.' + extension, '.' + extension)
317319

5.63 KB
Binary file not shown.

tests/test_pytest_arraydiff.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,5 +152,27 @@ def test_absolute_tolerance():
152152
return np.ones((3, 4)) * 1.6 + 1.4
153153

154154

155+
@pytest.mark.array_compare(
156+
reference_dir=reference_dir,
157+
atol=1.5,
158+
file_format='fits',
159+
single_reference=True)
160+
@pytest.mark.parametrize('spam', ('egg', 'bacon'))
161+
def test_single_reference(spam):
162+
return np.ones((3, 4)) * 1.6 + 1.4
163+
164+
165+
class TestSingleReferenceClass:
166+
167+
@pytest.mark.array_compare(
168+
reference_dir=reference_dir,
169+
atol=1.5,
170+
file_format='fits',
171+
single_reference=True)
172+
@pytest.mark.parametrize('spam', ('egg', 'bacon'))
173+
def test_single_reference(self, spam):
174+
return np.ones((3, 4)) * 1.6 + 1.4
175+
176+
155177
def test_nofile():
156178
pass

0 commit comments

Comments
 (0)