diff options
Diffstat (limited to 'numpy/f2py/tests/test_callback.py')
| -rw-r--r-- | numpy/f2py/tests/test_callback.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/numpy/f2py/tests/test_callback.py b/numpy/f2py/tests/test_callback.py index 1b9a582ed..19aa4dd6e 100644 --- a/numpy/f2py/tests/test_callback.py +++ b/numpy/f2py/tests/test_callback.py @@ -3,9 +3,10 @@ from __future__ import division, absolute_import, print_function import math import textwrap import sys +import pytest import numpy as np -from numpy.testing import run_module_suite, assert_, assert_equal, dec +from numpy.testing import run_module_suite, assert_, assert_equal from . import util @@ -60,12 +61,12 @@ cf2py intent(out) a end """ - @dec.slow + @pytest.mark.slow def test_all(self): for name in "t,t2".split(","): self.check_function(name) - @dec.slow + @pytest.mark.slow def test_docstring(self): expected = """ a = t(fun,[fun_extra_args]) @@ -130,8 +131,8 @@ cf2py intent(out) a r = t(a.mth) assert_(r == 9, repr(r)) - @dec.knownfailureif(sys.platform=='win32', - msg='Fails with MinGW64 Gfortran (Issue #9673)') + @pytest.mark.skipif(sys.platform=='win32', + reason='Fails with MinGW64 Gfortran (Issue #9673)') def test_string_callback(self): def callback(code): @@ -144,8 +145,8 @@ cf2py intent(out) a r = f(callback) assert_(r == 0, repr(r)) - @dec.knownfailureif(sys.platform=='win32', - msg='Fails with MinGW64 Gfortran (Issue #9673)') + @pytest.mark.skipif(sys.platform=='win32', + reason='Fails with MinGW64 Gfortran (Issue #9673)') def test_string_callback_array(self): # See gh-10027 cu = np.zeros((1, 8), 'S1') |