refactor starting and stopping pexpect

IPython/terminal/console/tests/test_console.py

@@ -29,33 +29,11 b' from IPython.utils import py3compat'
 @dec.skip_win32
 def test_console_starts():
     """test that `ipython console` starts a terminal"""
-    from IPython.external import pexpect
-    
-    args = ['console', '--colors=NoColor']
-    # FIXME: remove workaround for 2.6 support
-    if sys.version_info[:2] > (2,6):
-        args = ['-m', 'IPython'] + args
-        cmd = sys.executable
-    else:
-        cmd = 'ipython'
-    
-    try:
-        p = pexpect.spawn(cmd, args=args)
-    except IOError:
-        raise SkipTest("Couldn't find command %s" % cmd)
-    
-    # timeout after one minute
-    t = 60
-    idx = p.expect([r'In \[\d+\]', pexpect.EOF], timeout=t)
+    p, pexpect, t = start_console()
     p.sendline('5')
     idx = p.expect([r'Out\[\d+\]: 5', pexpect.EOF], timeout=t)
     idx = p.expect([r'In \[\d+\]', pexpect.EOF], timeout=t)
-    # send ctrl-D;ctrl-D to exit
-    p.sendeof()
-    p.sendeof()
-    p.expect([pexpect.EOF, pexpect.TIMEOUT], timeout=t)
-    if p.isalive():
-        p.terminate()
+    stop_console(p, pexpect, t)
 
 def test_help_output():
     """ipython console --help-all works"""
@@ -68,7 +46,25 b' def test_display_text():'
     #
     #   x = %lsmagic
     #   from IPython.display import display; display(x);
+    p, pexpect, t = start_console()
+    p.sendline('x = %lsmagic')
+    idx = p.expect([r'In \[\d+\]', pexpect.EOF], timeout=t)
+    p.sendline('from IPython.display import display; display(x);')
+    p.expect([r'Available line magics:', pexpect.EOF], timeout=t)
+    stop_console(p, pexpect, t)
+
+def stop_console(p, pexpect, t):
+    "Stop a running `ipython console` running via pexpect"
+    # send ctrl-D;ctrl-D to exit
+    p.sendeof()
+    p.sendeof()
+    p.expect([pexpect.EOF, pexpect.TIMEOUT], timeout=t)
+    if p.isalive():
+        p.terminate()
+
 
+def start_console():
+    "Start `ipython console` using pexpect"
     from IPython.external import pexpect
     
     args = ['console', '--colors=NoColor']
@@ -87,14 +83,4 b' def test_display_text():'
     # timeout after one minute
     t = 60
     idx = p.expect([r'In \[\d+\]', pexpect.EOF], timeout=t)
-    p.sendline('x = %lsmagic')
-    idx = p.expect([r'In \[\d+\]', pexpect.EOF], timeout=t)
-    p.sendline('from IPython.display import display; display(x);')
-    p.expect([r'Available line magics:', pexpect.EOF], timeout=t)
-
-    # send ctrl-D;ctrl-D to exit
-    p.sendeof()
-    p.sendeof()
-    p.expect([pexpect.EOF, pexpect.TIMEOUT], timeout=t)
-    if p.isalive():
-        p.terminate()
+    return p, pexpect, t