summaryrefslogtreecommitdiff
path: root/numpy/f2py
diff options
context:
space:
mode:
authorEvgeni Burovski <evgeni@burovski.me>2015-11-15 07:48:20 +0000
committerEvgeni Burovski <evgeni@burovski.me>2015-11-16 15:59:19 +0000
commit70c5052a9f07025c236033cf629506bb38eb6d97 (patch)
tree0fcffcf204b9ad1f0c2c351e7ad74d5bce83286d /numpy/f2py
parentcf66c68c6a560c934f4a767934573c7f85dcb4ae (diff)
downloadnumpy-70c5052a9f07025c236033cf629506bb38eb6d97.tar.gz
ENH: testing: add SkipTest and KnownFailureException
* use SkipTest in numpy tests instead of importing it from nose * add a KnownFailureException as an alias for KnownFailureTest (the former is preferred, but the latter is kept for backcompat) * rename the KnownFailure nose plugin into KnownFailurePlugin, and keep the old name for backcompat
Diffstat (limited to 'numpy/f2py')
-rw-r--r--numpy/f2py/tests/test_array_from_pyobj.py6
-rw-r--r--numpy/f2py/tests/util.py9
2 files changed, 6 insertions, 9 deletions
diff --git a/numpy/f2py/tests/test_array_from_pyobj.py b/numpy/f2py/tests/test_array_from_pyobj.py
index 9551c099e..48bb7c0f4 100644
--- a/numpy/f2py/tests/test_array_from_pyobj.py
+++ b/numpy/f2py/tests/test_array_from_pyobj.py
@@ -5,13 +5,11 @@ import os
import sys
import copy
-import nose
-
from numpy import (
array, alltrue, ndarray, zeros, dtype, intp, clongdouble
)
from numpy.testing import (
- run_module_suite, assert_, assert_equal
+ run_module_suite, assert_, assert_equal, SkipTest
)
from numpy.core.multiarray import typeinfo
import util
@@ -28,7 +26,7 @@ def setup():
# Check compiler availability first
if not util.has_c_compiler():
- raise nose.SkipTest("No C compiler available")
+ raise SkipTest("No C compiler available")
if wrap is None:
config_code = """
diff --git a/numpy/f2py/tests/util.py b/numpy/f2py/tests/util.py
index 5b4e072e7..8d06d9680 100644
--- a/numpy/f2py/tests/util.py
+++ b/numpy/f2py/tests/util.py
@@ -17,10 +17,9 @@ import textwrap
import re
import random
-import nose
-
from numpy.compat import asbytes, asstr
import numpy.f2py
+from numpy.testing import SkipTest
try:
from hashlib import md5
@@ -334,7 +333,7 @@ class F2PyTest(object):
# Check compiler availability first
if not has_c_compiler():
- raise nose.SkipTest("No C compiler available")
+ raise SkipTest("No C compiler available")
codes = []
if self.sources:
@@ -350,9 +349,9 @@ class F2PyTest(object):
elif fn.endswith('.f90'):
needs_f90 = True
if needs_f77 and not has_f77_compiler():
- raise nose.SkipTest("No Fortran 77 compiler available")
+ raise SkipTest("No Fortran 77 compiler available")
if needs_f90 and not has_f90_compiler():
- raise nose.SkipTest("No Fortran 90 compiler available")
+ raise SkipTest("No Fortran 90 compiler available")
# Build the module
if self.code is not None: