##// END OF EJS Templates
Fix frontend tests so they obtain the right global test IPython object.
Fernando Perez -
Show More
@@ -20,7 +20,7 b' import sys'
20 from nose.tools import assert_equal
20 from nose.tools import assert_equal
21
21
22 from IPython.frontend.prefilterfrontend import PrefilterFrontEnd
22 from IPython.frontend.prefilterfrontend import PrefilterFrontEnd
23 from IPython.core.ipapi import get as get_ipython0
23 from IPython.testing.globalipapp import get_ipython
24 from IPython.testing.tools import default_argv
24 from IPython.testing.tools import default_argv
25
25
26 #-----------------------------------------------------------------------------
26 #-----------------------------------------------------------------------------
@@ -60,7 +60,7 b' def isolate_ipython0(func):'
60 with arguments.
60 with arguments.
61 """
61 """
62 def my_func():
62 def my_func():
63 ip0 = get_ipython0()
63 ip0 = get_ipython()
64 if ip0 is None:
64 if ip0 is None:
65 return func()
65 return func()
66 # We have a real ipython running...
66 # We have a real ipython running...
General Comments 0
You need to be logged in to leave comments. Login now