diff --git a/IPython/testing/decorators_numpy.py b/IPython/testing/decorators_numpy.py index e6a56cb..792dd00 100644 --- a/IPython/testing/decorators_numpy.py +++ b/IPython/testing/decorators_numpy.py @@ -29,13 +29,6 @@ def setastest(tf=True): tf : bool If True specifies this is a test, not a test otherwise - e.g - >>> from numpy.testing.decorators import setastest - >>> @setastest(False) - ... def func_with_test_in_name(arg1, arg2): pass - ... - >>> - This decorator cannot use the nose namespace, because it can be called from a non-test module. See also istest and nottest in nose.tools diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py index 9910f42..bba6d6a 100644 --- a/IPython/testing/iptest.py +++ b/IPython/testing/iptest.py @@ -71,7 +71,8 @@ EXCLUDE = [pjoin('IPython', 'external'), pjoin('IPython', 'Extensions', 'numeric_formats'), pjoin('IPython', 'testing', 'attic'), pjoin('IPython', 'testing', 'tutils'), - pjoin('IPython', 'testing', 'tools') + pjoin('IPython', 'testing', 'tools'), + pjoin('IPython', 'testing', 'mkdoctests') ] if not have_wx: @@ -88,6 +89,10 @@ if not have_curses: if not sys.platform == 'win32': EXCLUDE.append(pjoin('IPython', 'platutils_win32')) +if sys.platform == 'win32': + EXCLUDE.append(pjoin('IPython', 'testing', 'plugin', 'test_exampleip')) + EXCLUDE.append(pjoin('IPython', 'testing', 'plugin', 'dtexample')) + if not os.name == 'posix': EXCLUDE.append(pjoin('IPython', 'platutils_posix'))