##// END OF EJS Templates
Brian Granger -
Show More
@@ -3,16 +3,14 b''
3 Needs to be run by nose (to make ipython session available).
3 Needs to be run by nose (to make ipython session available).
4 """
4 """
5
5
6 # Standard library imports
7 import os
6 import os
8 import sys
7 import sys
9 import tempfile
8 import tempfile
10 import types
9 import types
11
10
12 # Third-party imports
13 import nose.tools as nt
11 import nose.tools as nt
14
12
15 # From our own code
13 from IPython.platutils import find_cmd
16 from IPython.testing import decorators as dec
14 from IPython.testing import decorators as dec
17 from IPython.testing import tools as tt
15 from IPython.testing import tools as tt
18
16
@@ -67,7 +65,8 b' def test_obj_del():'
67 """Test that object's __del__ methods are called on exit."""
65 """Test that object's __del__ methods are called on exit."""
68 test_dir = os.path.dirname(__file__)
66 test_dir = os.path.dirname(__file__)
69 del_file = os.path.join(test_dir,'obj_del.py')
67 del_file = os.path.join(test_dir,'obj_del.py')
70 out = _ip.IP.getoutput('ipython %s' % del_file)
68 ipython_cmd = find_cmd('ipython')
69 out = _ip.IP.getoutput('%s %s' % (ipython_cmd, del_file))
71 nt.assert_equals(out,'obj_del.py: object A deleted')
70 nt.assert_equals(out,'obj_del.py: object A deleted')
72
71
73
72
General Comments 0
You need to be logged in to leave comments. Login now