Skip to content

Commit e00884a

Browse files
authored
Merge pull request #436 from jhlegarreta/tst/filter-divide-by-zero-warning
TST: Filter DIPY's divide by zero warnings in DTI model fitting tests
2 parents bf22233 + 8be18e1 commit e00884a

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

test/test_model_dmri.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@
6262
)
6363

6464

65-
def ignore_dipy_invalid_divide(func):
65+
def ignore_dipy_divide_warning(func):
6666
@functools.wraps(func)
6767
def _wrapped(*args, **kwargs):
6868
with warnings.catch_warnings():
6969
warnings.filterwarnings(
7070
"ignore",
71-
message=r".*invalid value encountered in divide.*",
71+
message=r".*(invalid value encountered in divide|divide by zero encountered in log).*",
7272
category=RuntimeWarning,
7373
)
7474
return func(*args, **kwargs)
@@ -628,7 +628,7 @@ def test_dti_prediction_shape(setup_random_dwi_data, index):
628628
@pytest.mark.parametrize("index", (None, 3, 5))
629629
@pytest.mark.parametrize("ignore_bzero", (False, True))
630630
@pytest.mark.parametrize("use_mask", (False, True))
631-
@ignore_dipy_invalid_divide
631+
@ignore_dipy_divide_warning
632632
def test_dti_model_fit(single_shell_test_data, index, ignore_bzero, use_mask):
633633
"""Ensure that we get the same result obtained through the DTI model
634634
implemented in DIPY."""
@@ -714,7 +714,7 @@ def test_dti_model_fit(single_shell_test_data, index, ignore_bzero, use_mask):
714714
@pytest.mark.parametrize("index", (None, 3, 5))
715715
@pytest.mark.parametrize("ignore_bzero", (False, True))
716716
@pytest.mark.parametrize("use_mask", (False, True))
717-
@ignore_dipy_invalid_divide
717+
@ignore_dipy_divide_warning
718718
def test_dti_model_predict(single_shell_test_data, index, ignore_bzero, use_mask):
719719
"""Ensure that we get the same result obtained through the DTI model
720720
implemented in DIPY."""

0 commit comments

Comments
 (0)