mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-04-12 14:00:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merging -r 1177 from lp:ipython with fixes and resolutions.

Browse Source 
The main conflicts I had to fix were in ultratb.  I have removed
the ultraTB.py in IPython/kernel/core.  Now IPython/core/ultratb.py
is being used everywhere.  Also I have protected the calls to ipapi.get
to see if None is returned.  This happens when trial IPython.kernel
is run.
This commit is contained in:
Brian Granger 2009-08-03 12:50:56 -07:00
commit acc15a048b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IPython/testing/iptest.py
View File

@ -50,6 +50,7 @@ def test_for(mod):
have_curses = test_for('_curses')
have_wx = test_for('wx')
have_wx_aui = test_for('wx.aui')
have_zi = test_for('zope.interface')
have_twisted = test_for('twisted')
have_foolscap = test_for('foolscap')
@ -67,8 +68,9 @@ def make_exclude():
pjoin('IPython', 'frontend', 'process', 'winprocess.py'),
pjoin('IPython_doctest_plugin'),
pjoin('IPython', 'extensions', 'ipy_'),
pjoin('IPython', 'extensions', 'clearcmd'),
pjoin('IPython', 'extensions', 'PhysicalQInput'),
pjoin('IPython', 'extensions', 'PhysicalQInteractive'),
pjoin('IPython', 'extensions', 'InterpreterPasteInput'),
pjoin('IPython', 'extensions', 'scitedirector'),
pjoin('IPython', 'extensions', 'numeric_formats'),
pjoin('IPython', 'testing', 'attic'),
@ -81,6 +83,9 @@ def make_exclude():
EXCLUDE.append(pjoin('IPython', 'gui'))
EXCLUDE.append(pjoin('IPython', 'frontend', 'wx'))
if not have_wx_aui:
EXCLUDE.append(pjoin('IPython', 'gui', 'wx', 'wxIPython'))
if not have_objc:
EXCLUDE.append(pjoin('IPython', 'frontend', 'cocoa'))
@ -111,6 +116,7 @@ def make_exclude():
return EXCLUDE
#-----------------------------------------------------------------------------
# Functions and classes
#-----------------------------------------------------------------------------
@ -237,7 +243,7 @@ def run_iptestall():
t_start = time.time()
for name,runner in runners.iteritems():
print '*'*77
print 'IPython test set:', name
print 'IPython test group:',name
res = runner.run()
if res:
failed[name] = res
@ -248,14 +254,14 @@ def run_iptestall():
# summarize results
print
print '*'*77
print 'Ran %s test sets in %.3fs' % (nrunners, t_tests)
print 'Ran %s test groups in %.3fs' % (nrunners, t_tests)
print
if not failed:
print 'OK'
else:
# If anything went wrong, point out what command to rerun manually to
# see the actual errors and individual summary
print 'ERROR - %s out of %s test sets failed.' % (nfail, nrunners)
print 'ERROR - %s out of %s test groups failed.' % (nfail, nrunners)
for name in failed:
failed_runner = runners[name]
print '-'*40
@ -276,4 +282,4 @@ def main():
if __name__ == '__main__':
main()
main()