##// END OF EJS Templates
unpack out,err in ipexec...
MinRK -
r6221:5c32fc8c
parent child
Show More
@@ -216,14 +216,12 def ipexec(fname, options=None):
216 full_fname = os.path.join(test_dir, fname)
216 full_fname = os.path.join(test_dir, fname)
217 full_cmd = '%s %s %s' % (ipython_cmd, cmdargs, full_fname)
217 full_cmd = '%s %s %s' % (ipython_cmd, cmdargs, full_fname)
218 #print >> sys.stderr, 'FULL CMD:', full_cmd # dbg
218 #print >> sys.stderr, 'FULL CMD:', full_cmd # dbg
219 out = getoutputerror(full_cmd)
219 out, err = getoutputerror(full_cmd)
220 # `import readline` causes 'ESC[?1034h' to be output sometimes,
220 # `import readline` causes 'ESC[?1034h' to be output sometimes,
221 # so strip that out before doing comparisons
221 # so strip that out before doing comparisons
222 if out:
222 if out:
223 out,err = out
224 out = re.sub(r'\x1b\[[^h]+h', '', out)
223 out = re.sub(r'\x1b\[[^h]+h', '', out)
225 out = out,err
224 return out, err
226 return out
227
225
228
226
229 def ipexec_validate(fname, expected_out, expected_err='',
227 def ipexec_validate(fname, expected_out, expected_err='',
General Comments 0
You need to be logged in to leave comments. Login now