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/lib/tests/test_recfunctions.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/lib/tests/test_recfunctions.py')
-rw-r--r-- | numpy/lib/tests/test_recfunctions.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/numpy/lib/tests/test_recfunctions.py b/numpy/lib/tests/test_recfunctions.py index bc9f8d7b6..e1b62d46a 100644 --- a/numpy/lib/tests/test_recfunctions.py +++ b/numpy/lib/tests/test_recfunctions.py @@ -1,11 +1,13 @@ from __future__ import division, absolute_import, print_function +import pytest + import numpy as np import numpy.ma as ma from numpy.ma.mrecords import MaskedRecords from numpy.ma.testutils import assert_equal from numpy.testing import ( - run_module_suite, assert_, assert_raises, dec + run_module_suite, assert_, assert_raises, ) from numpy.lib.recfunctions import ( drop_fields, rename_fields, get_fieldstructure, recursive_fill_fields, @@ -687,7 +689,7 @@ class TestJoinBy(object): b = np.ones(3, dtype=[('c', 'u1'), ('b', 'f4'), ('a', 'i4')]) assert_raises(ValueError, join_by, ['a', 'b', 'b'], a, b) - @dec.knownfailureif(True) + @pytest.mark.xfail(reason="See comment at gh-9343") def test_same_name_different_dtypes_key(self): a_dtype = np.dtype([('key', 'S5'), ('value', '<f4')]) b_dtype = np.dtype([('key', 'S10'), ('value', '<f4')]) |