##// END OF EJS Templates
Merging -r 1177 from lp:ipython with fixes and resolutions....
Merging -r 1177 from lp:ipython with fixes and resolutions. 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.

File last commit:

r1334:049617d6
r2124:4a54d9d3 merge
Show More
iptest.py
18 lines | 474 B | text/x-python | PythonLexer
#!/usr/bin/env python
"""Nose-based test runner.
"""
from nose.core import main
from nose.plugins.builtin import plugins
from nose.plugins.doctests import Doctest
import ipdoctest
from ipdoctest import IPDocTestRunner
if __name__ == '__main__':
print 'WARNING: this code is incomplete!'
print
pp = [x() for x in plugins] # activate all builtin plugins first
main(testRunner=IPDocTestRunner(),
plugins=pp+[ipdoctest.IPythonDoctest(),Doctest()])