summaryrefslogtreecommitdiff
path: root/numpy/lib/tests/test_utils.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2018-04-06 18:03:31 -0600
committerGitHub <noreply@github.com>2018-04-06 18:03:31 -0600
commit036151143bff1eebeded5582534e676a192352cd (patch)
tree8bc070f39accd6241c05c923b1364cafc4e0f700 /numpy/lib/tests/test_utils.py
parent70c060dfdab9e0c31eeec248ed40c26d3555033c (diff)
parentfedcb3d1276f7f9ff92ef260ac1bfa6b31690742 (diff)
downloadnumpy-036151143bff1eebeded5582534e676a192352cd.tar.gz
Merge pull request #10842 from charris/switch-to-pytest
TST: Switch to pytest
Diffstat (limited to 'numpy/lib/tests/test_utils.py')
-rw-r--r--numpy/lib/tests/test_utils.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/numpy/lib/tests/test_utils.py b/numpy/lib/tests/test_utils.py
index 92bcdc238..7d8e7e68e 100644
--- a/numpy/lib/tests/test_utils.py
+++ b/numpy/lib/tests/test_utils.py
@@ -1,9 +1,11 @@
from __future__ import division, absolute_import, print_function
import sys
+import pytest
+
from numpy.core import arange
from numpy.testing import (
- run_module_suite, assert_, assert_equal, assert_raises_regex, dec
+ run_module_suite, assert_, assert_equal, assert_raises_regex
)
from numpy.lib import deprecate
import numpy.lib.utils as utils
@@ -14,7 +16,7 @@ else:
from StringIO import StringIO
-@dec.skipif(sys.flags.optimize == 2)
+@pytest.mark.skipif(sys.flags.optimize == 2, reason="Python running -OO")
def test_lookfor():
out = StringIO()
utils.lookfor('eigenvalue', module='numpy', output=out,