diff --git a/IPython/config/tests/test_imports.py b/IPython/config/tests/test_imports.py index 192149a..84fb531 100644 --- a/IPython/config/tests/test_imports.py +++ b/IPython/config/tests/test_imports.py @@ -1,7 +1,5 @@ #!/usr/bin/env python # encoding: utf-8 -def test_import_userconfig(): - from IPython.config import userconfig diff --git a/IPython/core/tests/test_imports.py b/IPython/core/tests/test_imports.py index 7450104..6257539 100644 --- a/IPython/core/tests/test_imports.py +++ b/IPython/core/tests/test_imports.py @@ -55,9 +55,6 @@ def test_import_release(): def test_import_shadowns(): from IPython.core import shadowns -def test_import_shell(): - from IPython.core import shell - def test_import_ultratb(): from IPython.core import ultratb diff --git a/IPython/lib/irunner.py b/IPython/lib/irunner.py index 7539802..2b8dd28 100644 --- a/IPython/lib/irunner.py +++ b/IPython/lib/irunner.py @@ -222,7 +222,7 @@ class InteractiveRunner(object): write(cmd) continue - #write('AFTER: '+c.after) # dbg + # write('AFTER: '+c.after) # dbg write(c.after) c.send(cmd) try: diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py index 306b9e0..e229787 100644 --- a/IPython/testing/iptest.py +++ b/IPython/testing/iptest.py @@ -32,7 +32,7 @@ import nose.plugins.builtin from nose.core import TestProgram from IPython.utils.platutils import find_cmd -from IPython.testing.plugin.ipdoctest import IPythonDoctest +# from IPython.testing.plugin.ipdoctest import IPythonDoctest pjoin = path.join @@ -70,12 +70,8 @@ def make_exclude(): EXCLUDE = [pjoin('IPython', 'external'), pjoin('IPython', 'frontend', 'process', 'winprocess.py'), pjoin('IPython_doctest_plugin'), - pjoin('IPython', 'extensions', 'ipy_'), - pjoin('IPython', 'extensions', 'PhysicalQInput'), - pjoin('IPython', 'extensions', 'PhysicalQInteractive'), - pjoin('IPython', 'extensions', 'InterpreterPasteInput'), - pjoin('IPython', 'extensions', 'scitedirector'), - pjoin('IPython', 'extensions', 'numeric_formats'), + pjoin('IPython', 'quarantine'), + pjoin('IPython', 'deathrow'), pjoin('IPython', 'testing', 'attic'), pjoin('IPython', 'testing', 'tools'), pjoin('IPython', 'testing', 'mkdoctests'), @@ -83,7 +79,6 @@ def make_exclude(): ] if not have_wx: - EXCLUDE.append(pjoin('IPython', 'extensions', 'igrid')) EXCLUDE.append(pjoin('IPython', 'gui')) EXCLUDE.append(pjoin('IPython', 'frontend', 'wx')) EXCLUDE.append(pjoin('IPython', 'lib', 'inputhookwx')) @@ -97,9 +92,6 @@ def make_exclude(): if not have_objc: EXCLUDE.append(pjoin('IPython', 'frontend', 'cocoa')) - if not have_curses: - EXCLUDE.append(pjoin('IPython', 'extensions', 'ibrowse')) - if not sys.platform == 'win32': EXCLUDE.append(pjoin('IPython', 'utils', 'platutils_win32')) @@ -136,9 +128,6 @@ def make_exclude(): EXCLUDE.append(pjoin('IPython', 'testing', 'tests', 'test_decorators_trial')) - # Skip shell always because of a bug in FakeModule. - EXCLUDE.append(pjoin('IPython', 'core', 'shell')) - # This is needed for the reg-exp to match on win32 in the ipdoctest plugin. if sys.platform == 'win32': EXCLUDE = [s.replace('\\','\\\\') for s in EXCLUDE] @@ -167,9 +156,9 @@ def run_iptest(): # test suite back into working shape. Our nose # plugin needs to be gone through with a fine # toothed comb to find what is causing the problem. - '--with-ipdoctest', - '--ipdoctest-tests','--ipdoctest-extension=txt', - '--detailed-errors', + # '--with-ipdoctest', + # '--ipdoctest-tests','--ipdoctest-extension=txt', + # '--detailed-errors', # We add --exe because of setuptools' imbecility (it # blindly does chmod +x on ALL files). Nose does the @@ -196,7 +185,8 @@ def run_iptest(): # Construct list of plugins, omitting the existing doctest plugin, which # ours replaces (and extends). EXCLUDE = make_exclude() - plugins = [IPythonDoctest(EXCLUDE)] + plugins = [] + # plugins = [IPythonDoctest(EXCLUDE)] for p in nose.plugins.builtin.plugins: plug = p() if plug.name == 'doctest': @@ -254,7 +244,7 @@ def make_runners(): """ nose_packages = ['config', 'core', 'extensions', - 'frontend', 'lib', 'quarantine', + 'frontend', 'lib', 'scripts', 'testing', 'utils'] trial_packages = ['kernel']