TST: wrap skipifs in pytest.param, closes #1460

Author: kohr-h

odl/util/testutils.py

@@ -15,6 +15,7 @@
 import sys
 import warnings
 from builtins import object
+from functools import partial
 from time import time
 
 import numpy as np
@@ -199,28 +200,44 @@ def _pass(function):
     skip_if_no_benchmark = _pass
 else:
     # Used in lists where the elements should all be skipifs
-    never_skip = pytest.mark.skipif(
-        "False",
-        reason='Fill in, never skips'
+    never_skip = partial(
+        pytest.param,
+        marks=pytest.mark.skipif(
+            'False',
+            reason='',
+        )
     )
 
-    skip_if_no_pywavelets = pytest.mark.skipif(
-        "not odl.trafos.PYWT_AVAILABLE",
-        reason='PyWavelets not available'
+    skip_if_no_pywavelets = partial(
+        pytest.param,
+        marks=pytest.mark.skipif(
+            'not odl.trafos.PYWT_AVAILABLE',
+            reason='PyWavelets not available',
+        )
     )
 
-    skip_if_no_pyfftw = pytest.mark.skipif(
-        "not odl.trafos.PYFFTW_AVAILABLE",
-        reason='pyFFTW not available')
+    skip_if_no_pyfftw = partial(
+        pytest.param,
+        marks=pytest.mark.skipif(
+            'not odl.trafos.PYFFTW_AVAILABLE',
+            reason='pyFFTW not available',
+        )
+    )
 
-    skip_if_no_largescale = pytest.mark.skipif(
-        "not pytest.config.getoption('--largescale')",
-        reason='Need --largescale option to run'
+    skip_if_no_largescale = partial(
+        pytest.param,
+        marks=pytest.mark.skipif(
+            "not pytest.config.getoption('--largescale')",
+            reason='Need --largescale option to run',
+        )
     )
 
-    skip_if_no_benchmark = pytest.mark.skipif(
-        "not pytest.config.getoption('--benchmark')",
-        reason='Need --benchmark option to run'
+    skip_if_no_benchmark = partial(
+        pytest.param,
+        marks=pytest.mark.skipif(
+            "not pytest.config.getoption('--benchmark')",
+            reason='Need --benchmark option to run',
+        )
     )