Skip to content

Commit efd215e

Browse files
committed
RF: refactor catch_warns calls for Eric's comments
Check wlist instead of raising an error.
1 parent 5da5130 commit efd215e

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

nibabel/tests/test_parrec.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,10 @@ def test_affine_regression():
185185

186186
def test_get_voxel_size_deprecated():
187187
hdr = PARRECHeader(HDR_INFO, HDR_DEFS)
188-
with catch_warn_reset(modules=[parrec]):
189-
simplefilter('error')
190-
assert_raises(DeprecationWarning, hdr.get_voxel_size)
188+
with catch_warn_reset(modules=[parrec], record=True) as wlist:
189+
simplefilter('always')
190+
hdr.get_voxel_size()
191+
assert_equal(wlist[0].category, DeprecationWarning)
191192

192193

193194
def test_get_sorted_slice_indices():
@@ -202,8 +203,7 @@ def test_get_sorted_slice_indices():
202203
17, 16, 15, 14, 13, 12, 11, 10, 9,
203204
26, 25, 24, 23, 22, 21, 20, 19, 18])
204205
# Omit last slice, only two volumes
205-
with catch_warn_reset(modules=[parrec]):
206-
simplefilter('ignore')
206+
with catch_warn_reset(modules=[parrec], record=True):
207207
hdr = PARRECHeader(HDR_INFO, HDR_DEFS[:-1], permit_truncated=True)
208208
assert_array_equal(hdr.get_sorted_slice_indices(), range(n_slices - 9))
209209

@@ -309,7 +309,6 @@ def test_truncations():
309309
assert_raises(PARRECError, PARRECHeader, gen_info, slice_info[:-1])
310310
# When we are permissive, we raise a warning, and drop a volume
311311
with catch_warn_reset(modules=[parrec], record=True) as wlist:
312-
simplefilter('always')
313312
hdr = PARRECHeader(gen_info, slice_info[:-1], permit_truncated=True)
314313
assert_equal(len(wlist), 1)
315314
assert_equal(hdr.get_data_shape(), (80, 80, 10))

0 commit comments

Comments
 (0)