##// END OF EJS Templates
Merge pull request #4912 from takluyver/win-io-failures...
Paul Ivanov -
r14893:04ab4044 merge
parent child Browse files
Show More
@@ -495,6 +495,7 b' def test_run_tb():'
495 nt.assert_in("RuntimeError", out)
495 nt.assert_in("RuntimeError", out)
496 nt.assert_equal(out.count("---->"), 3)
496 nt.assert_equal(out.count("---->"), 3)
497
497
498 @dec.knownfailureif(sys.platform == 'win32', "writes to io.stdout aren't captured on Windows")
498 def test_script_tb():
499 def test_script_tb():
499 """Test traceback offset in `ipython script.py`"""
500 """Test traceback offset in `ipython script.py`"""
500 with TemporaryDirectory() as td:
501 with TemporaryDirectory() as td:
@@ -11,6 +11,7 b''
11 # Imports
11 # Imports
12 #-----------------------------------------------------------------------------
12 #-----------------------------------------------------------------------------
13
13
14 import os
14 import sys
15 import sys
15 import nose.tools as nt
16 import nose.tools as nt
16 from IPython.utils.process import process_handler
17 from IPython.utils.process import process_handler
@@ -49,6 +50,8 b' def test_ipython_embed():'
49 std = out[0].decode('UTF-8')
50 std = out[0].decode('UTF-8')
50 nt.assert_equal(p.returncode, 0)
51 nt.assert_equal(p.returncode, 0)
51 nt.assert_in('3 . 14', std)
52 nt.assert_in('3 . 14', std)
52 nt.assert_in('IPython', std)
53 if os.name != 'nt':
54 # TODO: Fix up our different stdout references, see issue gh-14
55 nt.assert_in('IPython', std)
53 nt.assert_in('bye!', std)
56 nt.assert_in('bye!', std)
54
57
General Comments 0
You need to be logged in to leave comments. Login now