8000 Merge pull request #12238 from charris/fix-1.15-f2py-tests · r-devulap/numpy@5d7ec88 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5d7ec88

Browse files
charrischarris
authored
Merge pull request numpy#12238 from charris/fix-1.15-f2py-tests
TST: Backport azure-pipeline testing fixes for Mac
2 parents 7e6f705 + 854c1f5 commit 5d7ec88

File tree

2 files changed

+24
-13
lines changed

2 files changed

+24
-13
lines changed

‎numpy/f2py/tests/test_return_real.py

Lines changed: 15 additions & 9 deletions
< 8000 td data-grid-cell-id="diff-34f3dc90500765f5429af76b5c7edb598711c35db2faf675e220a5fbc9748286-202-207-1" data-selected="false" role="gridcell" style="background-color:var(--diffBlob-deletionNum-bgColor, var(--diffBlob-deletion-bgColor-num));text-align:center" tabindex="-1" valign="top" class="focusable-grid-cell diff-line-number position-relative left-side">
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from __future__ import division, absolute_import, print_function
22

3+
import platform
34
import pytest
45

56
from numpy import array
@@ -52,6 +53,11 @@ def check_function(self, t):
5253
pass
5354

5455

56+
57+
@pytest.mark.skipif(
58+
platform.system() == 'Darwin',
59+
reason="Prone to error when run with numpy/f2py/tests on mac os, "
60+
"but not when run in isolation")
5561
class TestCReturnReal(TestReturnReal):
5662
suffix = ".pyf"
5763
module_name = "c_ext_return_real"
@@ -85,9 +91,9 @@ class TestCReturnReal(TestReturnReal):
8591
"""
8692

8793
@pytest.mark.slow
88-
def test_all(self):
89-
for name in "t4,t8,s4,s8".split(","):
90-
self.check_function(getattr(self.module, name))
94+
@pytest.mark.parametrize('name', 't4,t8,s4,s8'.split(','))
95+
def test_all(self, name):
96+
self.check_function(getattr(self.module, name))
9197

9298

9399
class TestF77ReturnReal(TestReturnReal):
@@ -140,9 +146,9 @@ class TestF77ReturnReal(TestReturnReal):
140146
"""
141147

142148
@pytest.mark.slow
143-
def test_all(self):
144-
for name in "t0,t4,t8,td,s0,s4,s8,sd".split(","):
145-
self.check_function(getattr(self.module, name))
149+
@pytest.mark.parametrize('name', 't0,t4,t8,td,s0,s4,s8,sd'.split(','))
150+
def test_all(self, name):
151+
self.check_function(getattr(self.module, name))
146152

147153

148154
class TestF90ReturnReal(TestReturnReal):
@@ -199,6 +205,6 @@ class TestF90ReturnReal(TestReturnReal):
199205
"""
200206

201207
@pytest.mark.slow
202-
def test_all(self):
203-
for name in "t0,t4,t8,td,s0,s4,s8,sd".split(","):
204-
self.check_function(getattr(self.module.f90_return_real, name))
208+
@pytest.mark.parametrize('name', 't0,t4,t8,td,s0,s4,s8,sd'.split(','))
209+
def test_all(self, name):
210+
self.check_function(getattr(self.module.f90_return_real, name))

‎numpy/f2py/tests/test_semicolon_split.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
from . import util
77
from numpy.testing import assert_equal
88

9+
@pytest.mark.skipif(
10+
platform.system() == 'Darwin',
11+
reason="Prone to error when run with numpy/f2py/tests on mac os, "
12+
"but not when run in isolation")
913
class TestMultiline(util.F2PyTest):
1014
suffix = ".pyf"
1115
module_name = "multiline"
@@ -26,13 +30,14 @@ class TestMultiline(util.F2PyTest):
2630
end python module {module}
2731
""".format(module=module_name)
2832

29-
@pytest.mark.skipif(platform.system() == 'Darwin',
30-
reason="Prone to error when run with "
31-
"numpy/f2py/tests on mac os, "
32-
"but not when run in isolation")
3333
def test_multiline(self):
3434
assert_equal(self.module.foo(), 42)
3535

36+
37+
@pytest.mark.skipif(
38+
platform.system() == 'Darwin',
39+
reason="Prone to error when run with numpy/f2py/tests on mac os, "
40+
"but not when run in isolation")
3641
class TestCallstatement(util.F2PyTest):
3742
suffix = ".pyf"
3843
module_name = "callstatement"

0 commit comments

Comments
 (0)
0