diff options
author | Matthew Brett <matthew.brett@gmail.com> | 2011-08-15 12:58:03 -0700 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2011-08-16 10:44:29 -0600 |
commit | 316d1f4ec9e033b21062b8f2dcdddeef01d7a889 (patch) | |
tree | cfb40a73311530041159483318cb654f190b58b6 /numpy/testing/noseclasses.py | |
parent | 199535c5c34360be7238c80b25d810abce62e6e4 (diff) | |
download | numpy-316d1f4ec9e033b21062b8f2dcdddeef01d7a889.tar.gz |
FIX: fix doctest error with empty output
The numpy doctest extension generates an error with empty doctest output;
this most often comes about with the +SKIP option.
The numpy doctest plugin exposed a nose bug because it accidentally used
a different default for the 'doctest-result-variable'.
nose bug report here:
http://code.google.com/p/python-nose/issues/detail?id=445
Diffstat (limited to 'numpy/testing/noseclasses.py')
-rw-r--r-- | numpy/testing/noseclasses.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/numpy/testing/noseclasses.py b/numpy/testing/noseclasses.py index 25f6662b7..74b886fed 100644 --- a/numpy/testing/noseclasses.py +++ b/numpy/testing/noseclasses.py @@ -196,6 +196,7 @@ class NumpyDoctest(npd.Doctest): self.doctest_tests = True self.finder = NumpyDocTestFinder() self.parser = doctest.DocTestParser() + self.doctest_result_var = None # default in npd.Doctest if self.enabled: # Pull standard doctest out of plugin list; there's no reason to run # both. In practice the Unplugger plugin above would cover us when @@ -254,7 +255,8 @@ class NumpyDoctest(npd.Doctest): yield NumpyDocTestCase(test, optionflags=optionflags, - checker=NumpyOutputChecker()) + checker=NumpyOutputChecker(), + result_var = self.doctest_result_var) # Add an afterContext method to nose.plugins.doctests.Doctest in order |