Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the preferred name of the message argument for skipped PyTests. #1672

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions odl/test/tomo/operators/ray_trafo_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -359,9 +359,9 @@ def test_anisotropic_voxels(geometry):

# If no implementation is available, skip
if ndim == 2 and not odl.tomo.ASTRA_AVAILABLE:
pytest.skip(msg='ASTRA not available, skipping 2d test')
pytest.skip(reason='ASTRA not available, skipping 2d test')
elif ndim == 3 and not odl.tomo.ASTRA_CUDA_AVAILABLE:
pytest.skip(msg='ASTRA_CUDA not available, skipping 3d test')
pytest.skip(reason='ASTRA_CUDA not available, skipping 3d test')

ray_trafo = odl.tomo.RayTransform(space, geometry)
vol_one = ray_trafo.domain.one()
Expand Down Expand Up @@ -486,7 +486,7 @@ def test_detector_shifts_2d():
"""

if not odl.tomo.ASTRA_AVAILABLE:
pytest.skip(msg='ASTRA not available, skipping 2d test')
pytest.skip(reason='ASTRA not available, skipping 2d test')

d = 10
space = odl.uniform_discr([-1] * 2, [1] * 2, [d] * 2)
Expand Down Expand Up @@ -543,7 +543,7 @@ def test_source_shifts_2d():
"""

if not odl.tomo.ASTRA_AVAILABLE:
pytest.skip(msg='ASTRA required but not available')
pytest.skip(reason='ASTRA required but not available')

d = 10
space = odl.uniform_discr([-1] * 2, [1] * 2, [d] * 2)
Expand Down Expand Up @@ -622,7 +622,7 @@ def test_detector_shifts_3d():
numerically close (the error depends on domain discretization).
"""
if not odl.tomo.ASTRA_CUDA_AVAILABLE:
pytest.skip(msg='ASTRA CUDA required but not available')
pytest.skip(reason='ASTRA CUDA required but not available')

d = 100
space = odl.uniform_discr([-1] * 3, [1] * 3, [d] * 3)
Expand Down Expand Up @@ -677,7 +677,7 @@ def test_source_shifts_3d():
detector shifts
"""
if not odl.tomo.ASTRA_CUDA_AVAILABLE:
pytest.skip(msg='ASTRA_CUDA not available, skipping 3d test')
pytest.skip(reason='ASTRA_CUDA not available, skipping 3d test')

d = 10
space = odl.uniform_discr([-1] * 3, [1] * 3, [d] * 3)
Expand Down