summaryrefslogtreecommitdiff
path: root/numpy/linalg/tests/test_linalg.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2018-09-21 21:07:25 -0500
committerGitHub <noreply@github.com>2018-09-21 21:07:25 -0500
commit25f06a6684b88b925748544f51955d3b0a6db423 (patch)
tree7f75eb94fe0391f75eb1e0271428d28b5a7f7968 /numpy/linalg/tests/test_linalg.py
parent8c10f59ebb51fc63b9f97c9a427dd44be4d1e843 (diff)
parent1b14317405a80dd3ecd55faf50dfde15b075a9c5 (diff)
downloadnumpy-25f06a6684b88b925748544f51955d3b0a6db423.tar.gz
Merge pull request #12014 from tylerjereddy/issue_12013_pytest_skip
TST: prefer pytest.skip() over SkipTest
Diffstat (limited to 'numpy/linalg/tests/test_linalg.py')
-rw-r--r--numpy/linalg/tests/test_linalg.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/linalg/tests/test_linalg.py b/numpy/linalg/tests/test_linalg.py
index 6bb2cab7a..320d123e7 100644
--- a/numpy/linalg/tests/test_linalg.py
+++ b/numpy/linalg/tests/test_linalg.py
@@ -19,7 +19,7 @@ from numpy.linalg import matrix_power, norm, matrix_rank, multi_dot, LinAlgError
from numpy.linalg.linalg import _multi_dot_matrix_chain_order
from numpy.testing import (
assert_, assert_equal, assert_raises, assert_array_equal,
- assert_almost_equal, assert_allclose, SkipTest, suppress_warnings
+ assert_almost_equal, assert_allclose, suppress_warnings
)
@@ -1751,7 +1751,7 @@ def test_xerbla_override():
pid = os.fork()
except (OSError, AttributeError):
# fork failed, or not running on POSIX
- raise SkipTest("Not POSIX or fork failed.")
+ pytest.skip("Not POSIX or fork failed.")
if pid == 0:
# child; close i/o file handles
@@ -1786,7 +1786,7 @@ def test_xerbla_override():
# parent
pid, status = os.wait()
if os.WEXITSTATUS(status) != XERBLA_OK:
- raise SkipTest('Numpy xerbla not linked in.')
+ pytest.skip('Numpy xerbla not linked in.')
def test_sdot_bug_8577():