Show More
@@ -1,7 +1,5 b'' | |||
|
1 | 1 | #!/usr/bin/env python |
|
2 | 2 | # encoding: utf-8 |
|
3 | 3 | |
|
4 | def test_import_userconfig(): | |
|
5 | from IPython.config import userconfig | |
|
6 | 4 | |
|
7 | 5 |
@@ -55,9 +55,6 b' def test_import_release():' | |||
|
55 | 55 | def test_import_shadowns(): |
|
56 | 56 | from IPython.core import shadowns |
|
57 | 57 | |
|
58 | def test_import_shell(): | |
|
59 | from IPython.core import shell | |
|
60 | ||
|
61 | 58 | def test_import_ultratb(): |
|
62 | 59 | from IPython.core import ultratb |
|
63 | 60 |
@@ -222,7 +222,7 b' class InteractiveRunner(object):' | |||
|
222 | 222 | write(cmd) |
|
223 | 223 | continue |
|
224 | 224 | |
|
225 | #write('AFTER: '+c.after) # dbg | |
|
225 | # write('AFTER: '+c.after) # dbg | |
|
226 | 226 | write(c.after) |
|
227 | 227 | c.send(cmd) |
|
228 | 228 | try: |
@@ -32,7 +32,7 b' import nose.plugins.builtin' | |||
|
32 | 32 | from nose.core import TestProgram |
|
33 | 33 | |
|
34 | 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 | 37 | pjoin = path.join |
|
38 | 38 | |
@@ -70,12 +70,8 b' def make_exclude():' | |||
|
70 | 70 | EXCLUDE = [pjoin('IPython', 'external'), |
|
71 | 71 | pjoin('IPython', 'frontend', 'process', 'winprocess.py'), |
|
72 | 72 | pjoin('IPython_doctest_plugin'), |
|
73 |
pjoin('IPython', ' |
|
|
74 |
pjoin('IPython', ' |
|
|
75 | pjoin('IPython', 'extensions', 'PhysicalQInteractive'), | |
|
76 | pjoin('IPython', 'extensions', 'InterpreterPasteInput'), | |
|
77 | pjoin('IPython', 'extensions', 'scitedirector'), | |
|
78 | pjoin('IPython', 'extensions', 'numeric_formats'), | |
|
73 | pjoin('IPython', 'quarantine'), | |
|
74 | pjoin('IPython', 'deathrow'), | |
|
79 | 75 | pjoin('IPython', 'testing', 'attic'), |
|
80 | 76 | pjoin('IPython', 'testing', 'tools'), |
|
81 | 77 | pjoin('IPython', 'testing', 'mkdoctests'), |
@@ -83,7 +79,6 b' def make_exclude():' | |||
|
83 | 79 | ] |
|
84 | 80 | |
|
85 | 81 | if not have_wx: |
|
86 | EXCLUDE.append(pjoin('IPython', 'extensions', 'igrid')) | |
|
87 | 82 | EXCLUDE.append(pjoin('IPython', 'gui')) |
|
88 | 83 | EXCLUDE.append(pjoin('IPython', 'frontend', 'wx')) |
|
89 | 84 | EXCLUDE.append(pjoin('IPython', 'lib', 'inputhookwx')) |
@@ -97,9 +92,6 b' def make_exclude():' | |||
|
97 | 92 | if not have_objc: |
|
98 | 93 | EXCLUDE.append(pjoin('IPython', 'frontend', 'cocoa')) |
|
99 | 94 | |
|
100 | if not have_curses: | |
|
101 | EXCLUDE.append(pjoin('IPython', 'extensions', 'ibrowse')) | |
|
102 | ||
|
103 | 95 | if not sys.platform == 'win32': |
|
104 | 96 | EXCLUDE.append(pjoin('IPython', 'utils', 'platutils_win32')) |
|
105 | 97 | |
@@ -136,9 +128,6 b' def make_exclude():' | |||
|
136 | 128 | EXCLUDE.append(pjoin('IPython', 'testing', 'tests', |
|
137 | 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 | 131 | # This is needed for the reg-exp to match on win32 in the ipdoctest plugin. |
|
143 | 132 | if sys.platform == 'win32': |
|
144 | 133 | EXCLUDE = [s.replace('\\','\\\\') for s in EXCLUDE] |
@@ -167,9 +156,9 b' def run_iptest():' | |||
|
167 | 156 | # test suite back into working shape. Our nose |
|
168 | 157 | # plugin needs to be gone through with a fine |
|
169 | 158 | # toothed comb to find what is causing the problem. |
|
170 | '--with-ipdoctest', | |
|
171 | '--ipdoctest-tests','--ipdoctest-extension=txt', | |
|
172 | '--detailed-errors', | |
|
159 | # '--with-ipdoctest', | |
|
160 | # '--ipdoctest-tests','--ipdoctest-extension=txt', | |
|
161 | # '--detailed-errors', | |
|
173 | 162 | |
|
174 | 163 | # We add --exe because of setuptools' imbecility (it |
|
175 | 164 | # blindly does chmod +x on ALL files). Nose does the |
@@ -196,7 +185,8 b' def run_iptest():' | |||
|
196 | 185 | # Construct list of plugins, omitting the existing doctest plugin, which |
|
197 | 186 | # ours replaces (and extends). |
|
198 | 187 | EXCLUDE = make_exclude() |
|
199 | plugins = [IPythonDoctest(EXCLUDE)] | |
|
188 | plugins = [] | |
|
189 | # plugins = [IPythonDoctest(EXCLUDE)] | |
|
200 | 190 | for p in nose.plugins.builtin.plugins: |
|
201 | 191 | plug = p() |
|
202 | 192 | if plug.name == 'doctest': |
@@ -254,7 +244,7 b' def make_runners():' | |||
|
254 | 244 | """ |
|
255 | 245 | |
|
256 | 246 | nose_packages = ['config', 'core', 'extensions', |
|
257 |
'frontend', 'lib', |
|
|
247 | 'frontend', 'lib', | |
|
258 | 248 | 'scripts', 'testing', 'utils'] |
|
259 | 249 | trial_packages = ['kernel'] |
|
260 | 250 |
General Comments 0
You need to be logged in to leave comments.
Login now