|
@@
-32,7
+32,7
b' import nose.plugins.builtin'
|
|
32
|
from nose.core import TestProgram
|
|
32
|
from nose.core import TestProgram
|
|
33
|
|
|
33
|
|
|
34
|
from IPython.utils.platutils import find_cmd
|
|
34
|
from IPython.utils.platutils import find_cmd
|
|
35
|
from IPython.testing.plugin.ipdoctest import IPythonDoctest
|
|
35
|
# from IPython.testing.plugin.ipdoctest import IPythonDoctest
|
|
36
|
|
|
36
|
|
|
37
|
pjoin = path.join
|
|
37
|
pjoin = path.join
|
|
38
|
|
|
38
|
|
|
@@
-70,12
+70,8
b' def make_exclude():'
|
|
70
|
EXCLUDE = [pjoin('IPython', 'external'),
|
|
70
|
EXCLUDE = [pjoin('IPython', 'external'),
|
|
71
|
pjoin('IPython', 'frontend', 'process', 'winprocess.py'),
|
|
71
|
pjoin('IPython', 'frontend', 'process', 'winprocess.py'),
|
|
72
|
pjoin('IPython_doctest_plugin'),
|
|
72
|
pjoin('IPython_doctest_plugin'),
|
|
73
|
pjoin('IPython', 'extensions', 'ipy_'),
|
|
73
|
pjoin('IPython', 'quarantine'),
|
|
74
|
pjoin('IPython', 'extensions', 'PhysicalQInput'),
|
|
74
|
pjoin('IPython', 'deathrow'),
|
|
75
|
pjoin('IPython', 'extensions', 'PhysicalQInteractive'),
|
|
|
|
|
76
|
pjoin('IPython', 'extensions', 'InterpreterPasteInput'),
|
|
|
|
|
77
|
pjoin('IPython', 'extensions', 'scitedirector'),
|
|
|
|
|
78
|
pjoin('IPython', 'extensions', 'numeric_formats'),
|
|
|
|
|
79
|
pjoin('IPython', 'testing', 'attic'),
|
|
75
|
pjoin('IPython', 'testing', 'attic'),
|
|
80
|
pjoin('IPython', 'testing', 'tools'),
|
|
76
|
pjoin('IPython', 'testing', 'tools'),
|
|
81
|
pjoin('IPython', 'testing', 'mkdoctests'),
|
|
77
|
pjoin('IPython', 'testing', 'mkdoctests'),
|
|
@@
-83,7
+79,6
b' def make_exclude():'
|
|
83
|
]
|
|
79
|
]
|
|
84
|
|
|
80
|
|
|
85
|
if not have_wx:
|
|
81
|
if not have_wx:
|
|
86
|
EXCLUDE.append(pjoin('IPython', 'extensions', 'igrid'))
|
|
|
|
|
87
|
EXCLUDE.append(pjoin('IPython', 'gui'))
|
|
82
|
EXCLUDE.append(pjoin('IPython', 'gui'))
|
|
88
|
EXCLUDE.append(pjoin('IPython', 'frontend', 'wx'))
|
|
83
|
EXCLUDE.append(pjoin('IPython', 'frontend', 'wx'))
|
|
89
|
EXCLUDE.append(pjoin('IPython', 'lib', 'inputhookwx'))
|
|
84
|
EXCLUDE.append(pjoin('IPython', 'lib', 'inputhookwx'))
|
|
@@
-97,9
+92,6
b' def make_exclude():'
|
|
97
|
if not have_objc:
|
|
92
|
if not have_objc:
|
|
98
|
EXCLUDE.append(pjoin('IPython', 'frontend', 'cocoa'))
|
|
93
|
EXCLUDE.append(pjoin('IPython', 'frontend', 'cocoa'))
|
|
99
|
|
|
94
|
|
|
100
|
if not have_curses:
|
|
|
|
|
101
|
EXCLUDE.append(pjoin('IPython', 'extensions', 'ibrowse'))
|
|
|
|
|
102
|
|
|
|
|
|
103
|
if not sys.platform == 'win32':
|
|
95
|
if not sys.platform == 'win32':
|
|
104
|
EXCLUDE.append(pjoin('IPython', 'utils', 'platutils_win32'))
|
|
96
|
EXCLUDE.append(pjoin('IPython', 'utils', 'platutils_win32'))
|
|
105
|
|
|
97
|
|
|
@@
-136,9
+128,6
b' def make_exclude():'
|
|
136
|
EXCLUDE.append(pjoin('IPython', 'testing', 'tests',
|
|
128
|
EXCLUDE.append(pjoin('IPython', 'testing', 'tests',
|
|
137
|
'test_decorators_trial'))
|
|
129
|
'test_decorators_trial'))
|
|
138
|
|
|
130
|
|
|
139
|
# Skip shell always because of a bug in FakeModule.
|
|
|
|
|
140
|
EXCLUDE.append(pjoin('IPython', 'core', 'shell'))
|
|
|
|
|
141
|
|
|
|
|
|
142
|
# This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
|
|
131
|
# This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
|
|
143
|
if sys.platform == 'win32':
|
|
132
|
if sys.platform == 'win32':
|
|
144
|
EXCLUDE = [s.replace('\\','\\\\') for s in EXCLUDE]
|
|
133
|
EXCLUDE = [s.replace('\\','\\\\') for s in EXCLUDE]
|
|
@@
-167,9
+156,9
b' def run_iptest():'
|
|
167
|
# test suite back into working shape. Our nose
|
|
156
|
# test suite back into working shape. Our nose
|
|
168
|
# plugin needs to be gone through with a fine
|
|
157
|
# plugin needs to be gone through with a fine
|
|
169
|
# toothed comb to find what is causing the problem.
|
|
158
|
# toothed comb to find what is causing the problem.
|
|
170
|
'--with-ipdoctest',
|
|
159
|
# '--with-ipdoctest',
|
|
171
|
'--ipdoctest-tests','--ipdoctest-extension=txt',
|
|
160
|
# '--ipdoctest-tests','--ipdoctest-extension=txt',
|
|
172
|
'--detailed-errors',
|
|
161
|
# '--detailed-errors',
|
|
173
|
|
|
162
|
|
|
174
|
# We add --exe because of setuptools' imbecility (it
|
|
163
|
# We add --exe because of setuptools' imbecility (it
|
|
175
|
# blindly does chmod +x on ALL files). Nose does the
|
|
164
|
# blindly does chmod +x on ALL files). Nose does the
|
|
@@
-196,7
+185,8
b' def run_iptest():'
|
|
196
|
# Construct list of plugins, omitting the existing doctest plugin, which
|
|
185
|
# Construct list of plugins, omitting the existing doctest plugin, which
|
|
197
|
# ours replaces (and extends).
|
|
186
|
# ours replaces (and extends).
|
|
198
|
EXCLUDE = make_exclude()
|
|
187
|
EXCLUDE = make_exclude()
|
|
199
|
plugins = [IPythonDoctest(EXCLUDE)]
|
|
188
|
plugins = []
|
|
|
|
|
189
|
# plugins = [IPythonDoctest(EXCLUDE)]
|
|
200
|
for p in nose.plugins.builtin.plugins:
|
|
190
|
for p in nose.plugins.builtin.plugins:
|
|
201
|
plug = p()
|
|
191
|
plug = p()
|
|
202
|
if plug.name == 'doctest':
|
|
192
|
if plug.name == 'doctest':
|
|
@@
-254,7
+244,7
b' def make_runners():'
|
|
254
|
"""
|
|
244
|
"""
|
|
255
|
|
|
245
|
|
|
256
|
nose_packages = ['config', 'core', 'extensions',
|
|
246
|
nose_packages = ['config', 'core', 'extensions',
|
|
257
|
'frontend', 'lib', 'quarantine',
|
|
247
|
'frontend', 'lib',
|
|
258
|
'scripts', 'testing', 'utils']
|
|
248
|
'scripts', 'testing', 'utils']
|
|
259
|
trial_packages = ['kernel']
|
|
249
|
trial_packages = ['kernel']
|
|
260
|
|
|
250
|
|