Skip to content

TST: Backport azure-pipeline testing fixes for Mac #12238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charris merged 1 commit into from
Oct 21, 2018
+24 −13
Merged

TST: Backport azure-pipeline testing fixes for Mac #12238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
TST: Backport azure-pipeline testing fixes for Mac 
The azure-pipeline Mac testing fails unpredictably for some of the f2py
tests. The following tests are checked out from master to get the fixes.

- test_return_real.py
- test_semicolon_split.py
  • Loading branch information
@charris
charris committed Oct 21, 2018
commit 854c1f5aa6d01b4278d696ae91c8daadaa47b8d5
24 changes: 15 additions & 9 deletions numpy/f2py/tests/test_return_real.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import division, absolute_import, print_function

import platform
import pytest

from numpy import array
Expand Down Expand Up @@ -52,6 +53,11 @@ def check_function(self, t):
pass



@pytest.mark.skipif(
platform.system() == 'Darwin',
reason="Prone to error when run with numpy/f2py/tests on mac os, "
"but not when run in isolation")
class TestCReturnReal(TestReturnReal):
suffix = ".pyf"
module_name = "c_ext_return_real"
Expand Down Expand Up @@ -85,9 +91,9 @@ class TestCReturnReal(TestReturnReal):
"""

@pytest.mark.slow
def test_all(self):
for name in "t4,t8,s4,s8".split(","):
self.check_function(getattr(self.module, name))
@pytest.mark.parametrize('name', 't4,t8,s4,s8'.split(','))
def test_all(self, name):
self.check_function(getattr(self.module, name))


class TestF77ReturnReal(TestReturnReal):
Expand Down Expand Up @@ -140,9 +146,9 @@ class TestF77ReturnReal(TestReturnReal):
"""

@pytest.mark.slow
def test_all(self):
for name in "t0,t4,t8,td,s0,s4,s8,sd".split(","):
self.check_function(getattr(self.module, name))
@pytest.mark.parametrize('name', 't0,t4,t8,td,s0,s4,s8,sd'.split(','))
def test_all(self, name):
self.check_function(getattr(self.module, name))


class TestF90ReturnReal(TestReturnReal):
Expand Down Expand Up @@ -199,6 +205,6 @@ class TestF90ReturnReal(TestReturnReal):
"""

@pytest.mark.slow
def test_all(self):
for name in "t0,t4,t8,td,s0,s4,s8,sd".split(","):
self.check_function(getattr(self.module.f90_return_real, name))
@pytest.mark.parametrize('name', 't0,t4,t8,td,s0,s4,s8,sd'.split(','))
def test_all(self, name):
self.check_function(getattr(self.module.f90_return_real, name))
13 changes: 9 additions & 4 deletions numpy/f2py/tests/test_semicolon_split.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
from . import util
from numpy.testing import assert_equal

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

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


@pytest.mark.skipif(
platform.system() == 'Darwin',
reason="Prone to error when run with numpy/f2py/tests on mac os, "
"but not when run in isolation")
class TestCallstatement(util.F2PyTest):
suffix = ".pyf"
module_name = "callstatement"
Expand Down