diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2018-04-06 18:03:31 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-06 18:03:31 -0600 |
| commit | 036151143bff1eebeded5582534e676a192352cd (patch) | |
| tree | 8bc070f39accd6241c05c923b1364cafc4e0f700 /numpy/f2py/tests/test_common.py | |
| parent | 70c060dfdab9e0c31eeec248ed40c26d3555033c (diff) | |
| parent | fedcb3d1276f7f9ff92ef260ac1bfa6b31690742 (diff) | |
| download | numpy-036151143bff1eebeded5582534e676a192352cd.tar.gz | |
Merge pull request #10842 from charris/switch-to-pytest
TST: Switch to pytest
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, |