##// END OF EJS Templates
Fixing doctest EXCLUDES in iptest on win32....
Administrator -
Show More
@@ -30,6 +30,7 b' import warnings'
30 import nose.plugins.builtin
30 import nose.plugins.builtin
31 from nose.core import TestProgram
31 from nose.core import TestProgram
32
32
33 from IPython.platutils import find_cmd
33 from IPython.testing.plugin.ipdoctest import IPythonDoctest
34 from IPython.testing.plugin.ipdoctest import IPythonDoctest
34
35
35 pjoin = path.join
36 pjoin = path.join
@@ -43,6 +44,7 b' pjoin = path.join'
43 # modules, since this means untested code. As the testing machinery
44 # modules, since this means untested code. As the testing machinery
44 # solidifies, this list should eventually become empty.
45 # solidifies, this list should eventually become empty.
45 EXCLUDE = [pjoin('IPython', 'external'),
46 EXCLUDE = [pjoin('IPython', 'external'),
47 # This skip is duplicated below XXX
46 pjoin('IPython', 'platutils_win32'),
48 pjoin('IPython', 'platutils_win32'),
47 pjoin('IPython', 'frontend', 'cocoa'),
49 pjoin('IPython', 'frontend', 'cocoa'),
48 pjoin('IPython', 'frontend', 'process', 'winprocess.py'),
50 pjoin('IPython', 'frontend', 'process', 'winprocess.py'),
@@ -50,12 +52,28 b" EXCLUDE = [pjoin('IPython', 'external'),"
50 pjoin('IPython', 'Gnuplot'),
52 pjoin('IPython', 'Gnuplot'),
51 pjoin('IPython', 'Extensions', 'ipy_'),
53 pjoin('IPython', 'Extensions', 'ipy_'),
52 pjoin('IPython', 'Extensions', 'clearcmd'),
54 pjoin('IPython', 'Extensions', 'clearcmd'),
53 pjoin('IPython', 'Extensions', 'PhysicalQIn'),
55 pjoin('IPython', 'Extensions', 'PhysicalQInteractive'),
54 pjoin('IPython', 'Extensions', 'scitedirector'),
56 pjoin('IPython', 'Extensions', 'scitedirector'),
55 pjoin('IPython', 'Extensions', 'numeric_formats'),
57 pjoin('IPython', 'Extensions', 'numeric_formats'),
56 pjoin('IPython', 'testing', 'attic'),
58 pjoin('IPython', 'testing', 'attic'),
57 ]
59 ]
58
60
61 try:
62 import wx
63 except ImportError:
64 EXCLUDE.append(pjoin('IPython', 'Extensions', 'igrid'))
65
66 try:
67 import _curses
68 except ImportError:
69 EXCLUDE.append(pjoin('IPython', 'Extensions', 'ibrowse'))
70
71
72 # This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
73 if sys.platform == 'win32':
74 EXCLUDE = [s.replace('\\','\\\\') for s in EXCLUDE]
75
76
59 #-----------------------------------------------------------------------------
77 #-----------------------------------------------------------------------------
60 # Functions and classes
78 # Functions and classes
61 #-----------------------------------------------------------------------------
79 #-----------------------------------------------------------------------------
@@ -125,7 +143,7 b' class IPTester(object):'
125 if runner == 'iptest':
143 if runner == 'iptest':
126 self.runner = ['iptest','-v']
144 self.runner = ['iptest','-v']
127 else:
145 else:
128 self.runner = ['trial']
146 self.runner = [find_cmd('trial')]
129 if params is None:
147 if params is None:
130 params = []
148 params = []
131 if isinstance(params,str):
149 if isinstance(params,str):
General Comments 0
You need to be logged in to leave comments. Login now