Merge pull request #4912 from takluyver/win-io-failures

Skip some Windows io failures

IPython/core/tests/test_run.py

@@ -495,6 +495,7 @@ def test_run_tb():
         nt.assert_in("RuntimeError", out)
         nt.assert_equal(out.count("---->"), 3)
 
+@dec.knownfailureif(sys.platform == 'win32', "writes to io.stdout aren't captured on Windows")
 def test_script_tb():
     """Test traceback offset in `ipython script.py`"""
     with TemporaryDirectory() as td:

IPython/terminal/tests/test_embed.py

@@ -11,6 +11,7 @@
 # Imports
 #-----------------------------------------------------------------------------
 
+import os
 import sys
 import nose.tools as nt
 from IPython.utils.process import process_handler
@@ -49,6 +50,8 @@ def test_ipython_embed():
         std = out[0].decode('UTF-8')
         nt.assert_equal(p.returncode, 0)
         nt.assert_in('3 . 14', std)
-        nt.assert_in('IPython', std)
+        if os.name != 'nt':
+            # TODO: Fix up our different stdout references, see issue gh-14
+            nt.assert_in('IPython', std)
         nt.assert_in('bye!', std)