Change from skipping to xfail

tberlok · Feb 29, 2024 · 46a757f · 46a757f
1 parent d062e04
commit 46a757f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/tests/cuda-gpu/test_gpu_binary_tree.py b/tests/cuda-gpu/test_gpu_binary_tree.py
@@ -1,12 +1,16 @@
 import pytest
 
-cupy = pytest.importorskip("cupy")
-numba = pytest.importorskip("numba")
-
 
+@pytest.mark.xfail(raises=RuntimeError)
 def test_gpu_binary_tree():
-    import cupy as cp
-    from numba import cuda
+    try:
+        import cupy
+        import numba
+    except ImportError:
+        msg = ("Import of cupy and numba failed "
+               + " and GPU-tests can't run.")
+        pytest.xfail(msg)
+
     import paicos as pa
     from scipy.spatial import KDTree
     from paicos.trees.bvh_gpu import GpuBinaryTree

diff --git a/tests/cuda-gpu/test_gpu_ray_projector.py b/tests/cuda-gpu/test_gpu_ray_projector.py
@@ -1,13 +1,18 @@
 import pytest
 
-cupy = pytest.importorskip("cupy")
-numba = pytest.importorskip("numba")
-
 
 def test_gpu_ray_projector(show=False):
     """
     We compare the CPU and GPU implementations of ray-tracing.
     """
+    try:
+        import cupy
+        import numba
+    except ImportError:
+        msg = ("Import of cupy and numba failed "
+               + " and GPU-tests can't run.")
+        pytest.xfail(msg)
+
     import paicos as pa
     import numpy as np
     pa.use_units(True)

diff --git a/tests/cuda-gpu/test_gpu_sph_projector.py b/tests/cuda-gpu/test_gpu_sph_projector.py
@@ -1,13 +1,18 @@
 import pytest
 
-cupy = pytest.importorskip("cupy")
-numba = pytest.importorskip("numba")
-
 
 def test_gpu_sph_projector(show=False):
     """
     We compare the CPU and GPU implementations of SPH-projection.
     """
+    try:
+        import cupy
+        import numba
+    except ImportError:
+        msg = ("Import of cupy and numba failed "
+               + " and GPU-tests can't run.")
+        pytest.xfail(msg)
+
     import paicos as pa
     import numpy as np
     pa.use_units(True)