summaryrefslogtreecommitdiff
path: root/numpy/testing/nosetester.py
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/testing/nosetester.py
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/testing/nosetester.py')
-rw-r--r--numpy/testing/nosetester.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/testing/nosetester.py b/numpy/testing/nosetester.py
index c9c6d10f0..551e630ec 100644
--- a/numpy/testing/nosetester.py
+++ b/numpy/testing/nosetester.py
@@ -121,8 +121,8 @@ def run_module_suite(file_to_run=None, argv=None):
argv = argv + [file_to_run]
nose = import_nose()
- from .noseclasses import KnownFailure
- nose.run(argv=argv, addplugins=[KnownFailure()])
+ from .noseclasses import KnownFailurePlugin
+ nose.run(argv=argv, addplugins=[KnownFailurePlugin()])
class NoseTester(object):
@@ -301,8 +301,8 @@ class NoseTester(object):
'--cover-tests', '--cover-erase']
# construct list of plugins
import nose.plugins.builtin
- from .noseclasses import KnownFailure, Unplugger
- plugins = [KnownFailure()]
+ from .noseclasses import KnownFailurePlugin, Unplugger
+ plugins = [KnownFailurePlugin()]
plugins += [p() for p in nose.plugins.builtin.plugins]
# add doctesting if required
doctest_argv = '--with-doctest' in argv