Show More
@@ -30,6 +30,7 b' import warnings' | |||
|
30 | 30 | import nose.plugins.builtin |
|
31 | 31 | from nose.core import TestProgram |
|
32 | 32 | |
|
33 | from IPython.platutils import find_cmd | |
|
33 | 34 | from IPython.testing.plugin.ipdoctest import IPythonDoctest |
|
34 | 35 | |
|
35 | 36 | pjoin = path.join |
@@ -43,6 +44,7 b' pjoin = path.join' | |||
|
43 | 44 | # modules, since this means untested code. As the testing machinery |
|
44 | 45 | # solidifies, this list should eventually become empty. |
|
45 | 46 | EXCLUDE = [pjoin('IPython', 'external'), |
|
47 | # This skip is duplicated below XXX | |
|
46 | 48 | pjoin('IPython', 'platutils_win32'), |
|
47 | 49 | pjoin('IPython', 'frontend', 'cocoa'), |
|
48 | 50 | pjoin('IPython', 'frontend', 'process', 'winprocess.py'), |
@@ -50,12 +52,28 b" EXCLUDE = [pjoin('IPython', 'external')," | |||
|
50 | 52 | pjoin('IPython', 'Gnuplot'), |
|
51 | 53 | pjoin('IPython', 'Extensions', 'ipy_'), |
|
52 | 54 | pjoin('IPython', 'Extensions', 'clearcmd'), |
|
53 | pjoin('IPython', 'Extensions', 'PhysicalQIn'), | |
|
55 | pjoin('IPython', 'Extensions', 'PhysicalQInteractive'), | |
|
54 | 56 | pjoin('IPython', 'Extensions', 'scitedirector'), |
|
55 | 57 | pjoin('IPython', 'Extensions', 'numeric_formats'), |
|
56 | 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 | 78 | # Functions and classes |
|
61 | 79 | #----------------------------------------------------------------------------- |
@@ -125,7 +143,7 b' class IPTester(object):' | |||
|
125 | 143 | if runner == 'iptest': |
|
126 | 144 | self.runner = ['iptest','-v'] |
|
127 | 145 | else: |
|
128 | self.runner = ['trial'] | |
|
146 | self.runner = [find_cmd('trial')] | |
|
129 | 147 | if params is None: |
|
130 | 148 | params = [] |
|
131 | 149 | if isinstance(params,str): |
General Comments 0
You need to be logged in to leave comments.
Login now