summaryrefslogtreecommitdiff
path: root/numpy/testing/nosetester.py
diff options
context:
space:
mode:
authorMatthew Brett <matthew.brett@gmail.com>2009-12-29 16:54:26 +0000
committerMatthew Brett <matthew.brett@gmail.com>2009-12-29 16:54:26 +0000
commit0fef6e7813c9baa2c51d3f2eb8fa1352296c30b8 (patch)
treeec9b39ee006b5ebafe4a831c4212d608eda0db35 /numpy/testing/nosetester.py
parente4f233ecfedd2aafa258db2d3ae27e30604cc020 (diff)
downloadnumpy-0fef6e7813c9baa2c51d3f2eb8fa1352296c30b8.tar.gz
FIX - allow doctest tester to parse config before being replaced by NumpyDocTest
Diffstat (limited to 'numpy/testing/nosetester.py')
-rw-r--r--numpy/testing/nosetester.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/numpy/testing/nosetester.py b/numpy/testing/nosetester.py
index 03dc71ca3..9f345ad26 100644
--- a/numpy/testing/nosetester.py
+++ b/numpy/testing/nosetester.py
@@ -240,18 +240,11 @@ class NoseTester(object):
nose = import_nose()
- # construct list of plugins, omitting the existing doctest plugin
+ # construct list of plugins
import nose.plugins.builtin
from noseclasses import NumpyDoctest, KnownFailure
plugins = [NumpyDoctest(), KnownFailure()]
- for p in nose.plugins.builtin.plugins:
- plug = p()
- if plug.name == 'doctest':
- # skip the builtin doctest plugin
- continue
-
- plugins.append(plug)
-
+ plugins += [p() for p in nose.plugins.builtin.plugins]
return argv, plugins
def test(self, label='fast', verbose=1, extra_argv=None, doctests=False,