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_string.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_string.py')
| -rw-r--r-- | numpy/f2py/tests/test_string.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/numpy/f2py/tests/test_string.py b/numpy/f2py/tests/test_string.py index 065861c0b..79eeca1e9 100644 --- a/numpy/f2py/tests/test_string.py +++ b/numpy/f2py/tests/test_string.py @@ -1,8 +1,9 @@ from __future__ import division, absolute_import, print_function import os +import pytest -from numpy.testing import run_module_suite, assert_array_equal, dec +from numpy.testing import run_module_suite, assert_array_equal import numpy as np from . import util @@ -13,7 +14,7 @@ def _path(*a): class TestString(util.F2PyTest): sources = [_path('src', 'string', 'char.f90')] - @dec.slow + @pytest.mark.slow def test_char(self): strings = np.array(['ab', 'cd', 'ef'], dtype='c').T inp, out = self.module.char_test.change_strings(strings, strings.shape[1]) |