From 316d1f4ec9e033b21062b8f2dcdddeef01d7a889 Mon Sep 17 00:00:00 2001 From: Matthew Brett Date: Mon, 15 Aug 2011 12:58:03 -0700 Subject: 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 --- numpy/testing/noseclasses.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'numpy/testing/noseclasses.py') 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 -- cgit v1.2.1