Fixing console tests with IPython 5.1 on ci.

fabioz · Aug 17, 2016 · 6f673a4 · 6f673a4
1 parent 4b9c085
commit 6f673a4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/plugins/org.python.pydev/pysrc/tests/test_pydev_ipython_011.py b/plugins/org.python.pydev/pysrc/tests/test_pydev_ipython_011.py
@@ -3,12 +3,13 @@
 import threading
 import os
 from nose.tools import eq_
-from _pydev_bundle.pydev_imports import StringIO, SimpleXMLRPCServer
+from _pydev_bundle.pydev_imports import SimpleXMLRPCServer
 from _pydev_bundle.pydev_localhost import get_localhost
 from _pydev_bundle.pydev_console_utils import StdIn
 import socket
 from _pydev_bundle.pydev_ipython_console_011 import get_pydev_frontend
 import time
+from _pydevd_bundle import pydevd_io
 
 try:
     xrange
@@ -40,7 +41,7 @@ def redirect_stdout(self):
         from IPython.utils import io
 
         self.original_stdout = sys.stdout
-        sys.stdout = io.stdout = StringIO()
+        sys.stdout = io.stdout = pydevd_io.IOBuf()
 
     def restore_stdout(self):
         from IPython.utils import io

diff --git a/plugins/org.python.pydev/pysrc/tests/test_pydevconsole.py b/plugins/org.python.pydev/pysrc/tests/test_pydevconsole.py
@@ -73,7 +73,8 @@ def test_console_requests(self):
                 try:
                     self.assertEqual(['input_request'], found)  #IPython
                 except:
-                    self.assertEqual([u'Out[5]:', u'50', u'input_request'], found) # IPython 5.1
+                    self.assertEqual([u'50', u'input_request'], found[1:]) # IPython 5.1
+                    self.assertTrue(found[0].startswith(u'Out'))
 
             comps = interpreter.getCompletions('foo.', 'foo.')
             self.assert_(