summaryrefslogtreecommitdiff
path: root/numpy/f2py/tests/test_mixed.py
diff options
context:
space:
mode:
authorMatti Picus <matti.picus@gmail.com>2020-03-18 23:53:09 +0200
committerGitHub <noreply@github.com>2020-03-18 23:53:09 +0200
commit965b41d418e6100c1afae0b6f818a7ef152bc25d (patch)
tree0e31074466dd881a08c4a26de424362e035d9a53 /numpy/f2py/tests/test_mixed.py
parentc2dd245047ff2eb80972600163ecac9048d74e1f (diff)
downloadnumpy-965b41d418e6100c1afae0b6f818a7ef152bc25d.tar.gz
BUG, TST: fix f2py for PyPy, skip one test for PyPy (#15750)
* BUG, TST: fix f2py for PyPy, skip one test for PyPy, xfail tests for s390x
Diffstat (limited to 'numpy/f2py/tests/test_mixed.py')
-rw-r--r--numpy/f2py/tests/test_mixed.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/f2py/tests/test_mixed.py b/numpy/f2py/tests/test_mixed.py
index fc00ccc43..04266ca5b 100644
--- a/numpy/f2py/tests/test_mixed.py
+++ b/numpy/f2py/tests/test_mixed.py
@@ -2,7 +2,7 @@ import os
import textwrap
import pytest
-from numpy.testing import assert_, assert_equal
+from numpy.testing import assert_, assert_equal, IS_PYPY
from . import util
@@ -15,13 +15,13 @@ class TestMixed(util.F2PyTest):
_path('src', 'mixed', 'foo_fixed.f90'),
_path('src', 'mixed', 'foo_free.f90')]
- @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)
- @pytest.mark.slow
+ @pytest.mark.xfail(IS_PYPY,
+ reason="PyPy cannot modify tp_doc after PyType_Ready")
def test_docstring(self):
expected = textwrap.dedent("""\
a = bar11()