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_mixed.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_mixed.py')
| -rw-r--r-- | numpy/f2py/tests/test_mixed.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/numpy/f2py/tests/test_mixed.py b/numpy/f2py/tests/test_mixed.py index c145a4b23..e6eea8c4f 100644 --- a/numpy/f2py/tests/test_mixed.py +++ b/numpy/f2py/tests/test_mixed.py @@ -2,8 +2,9 @@ from __future__ import division, absolute_import, print_function import os import textwrap +import pytest -from numpy.testing import run_module_suite, assert_, assert_equal, dec +from numpy.testing import run_module_suite, assert_, assert_equal from . import util @@ -16,13 +17,13 @@ class TestMixed(util.F2PyTest): _path('src', 'mixed', 'foo_fixed.f90'), _path('src', 'mixed', 'foo_free.f90')] - @dec.slow + @pytest.mark.slow def test_all(self): assert_(self.module.bar11() == 11) assert_(self.module.foo_fixed.bar12() == 12) assert_(self.module.foo_free.bar13() == 13) - @dec.slow + @pytest.mark.slow def test_docstring(self): expected = """ a = bar11() |