diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py index 078ab76..9910f42 100644 --- a/IPython/testing/iptest.py +++ b/IPython/testing/iptest.py @@ -70,7 +70,8 @@ EXCLUDE = [pjoin('IPython', 'external'), pjoin('IPython', 'Extensions', 'scitedirector'), pjoin('IPython', 'Extensions', 'numeric_formats'), pjoin('IPython', 'testing', 'attic'), - pjoin('IPython', 'testing', 'tutils') + pjoin('IPython', 'testing', 'tutils'), + pjoin('IPython', 'testing', 'tools') ] if not have_wx: diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py index 50fbeb7..c43754c 100644 --- a/IPython/testing/tools.py +++ b/IPython/testing/tools.py @@ -26,15 +26,13 @@ Authors # Required modules and packages #----------------------------------------------------------------------------- -# Standard Python lib import os import sys -# Third-party import nose.tools as nt -# From this project from IPython.tools import utils +from IPython.testing import decorators as dec #----------------------------------------------------------------------------- # Globals @@ -55,6 +53,7 @@ for _x in [a for a in dir(nt) if a.startswith('assert')]: # Functions and classes #----------------------------------------------------------------------------- + def full_path(startPath,files): """Make full paths for all the listed files, based on startPath.