From 75873476f5e14ebc4254ba909e7ea70e992063cc Mon Sep 17 00:00:00 2001 From: Fernando Perez Date: Fri, 3 Apr 2009 02:03:12 -0700 Subject: [PATCH] - Make ipdoctest a little cleaner by giving it separate option names. This is in an attempt at better isolating it from the rest of nose, because we are seeing intermittent Twisted errors when it is enabled. However, I still see them sometimes. - Also, make the reference counting tests a little less verbose. --- IPython/testing/iptest.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py index 14f8eba11..50f9beedb 100644 --- a/IPython/testing/iptest.py +++ b/IPython/testing/iptest.py @@ -61,7 +61,7 @@ def main(): # plugin needs to be gone through with a fine # toothed comb to find what is causing the problem. # '--with-ipdoctest', - '--doctest-tests','--doctest-extension=txt', + '--ipdoctest-tests','--ipdoctest-extension=txt', '--detailed-errors', # We add --exe because of setuptools' imbecility (it @@ -81,11 +81,13 @@ def main(): (':' in arg and '.py' in arg): has_tests = True break + # If nothing was specifically requested, test full IPython if not has_tests: argv.append('IPython') - # Construct list of plugins, omitting the existing doctest plugin. + # Construct list of plugins, omitting the existing doctest plugin, which + # ours replaces (and extends). plugins = [IPythonDoctest(EXCLUDE)] for p in nose.plugins.builtin.plugins: plug = p()