diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2018-03-25 12:34:16 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2018-04-04 06:36:36 -0600 |
| commit | 7e5a41de9fab731e27a761c01302a0a93e2d1070 (patch) | |
| tree | dbd6265800ad401476bcde904e9bba86f6af2b85 /numpy/f2py/tests/test_common.py | |
| parent | 359e53ef8e479eefac0e184d4d25af50c2779ce0 (diff) | |
| download | numpy-7e5a41de9fab731e27a761c01302a0a93e2d1070.tar.gz | |
TST: Switch to using pytest markers
Use standard pytest markers everywhere in the numpy tests. At this point
there should be no nose dependency. However, nose is required to test
the legacy decorators if so desired.
At this point, numpy test cannot be run in the way with runtests, rather
installed numpy can be tested with `pytest --pyargs numpy` as long as
that is not run from the repo. Run it from the tools directory or some
such.
Diffstat (limited to 'numpy/f2py/tests/test_common.py')
| -rw-r--r-- | numpy/f2py/tests/test_common.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/numpy/f2py/tests/test_common.py b/numpy/f2py/tests/test_common.py index 81082e575..30640f8e9 100644 --- a/numpy/f2py/tests/test_common.py +++ b/numpy/f2py/tests/test_common.py @@ -2,10 +2,12 @@ from __future__ import division, absolute_import, print_function import os import sys +import pytest + import numpy as np from . import util -from numpy.testing import run_module_suite, assert_array_equal, dec +from numpy.testing import run_module_suite, assert_array_equal def _path(*a): return os.path.join(*((os.path.dirname(__file__),) + a)) @@ -13,7 +15,8 @@ def _path(*a): class TestCommonBlock(util.F2PyTest): sources = [_path('src', 'common', 'block.f')] - @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_common_block(self): self.module.initcb() assert_array_equal(self.module.block.long_bn, |