Permalink
Browse files

patch 8.0.0963: terminal test fails on MacOS

Problem:    Terminal test fails on MacOS. (chdiza)
Solution:   Wait for the shell to echo the characters. (closes #1991)
  • Loading branch information...
brammool committed Aug 19, 2017
1 parent 9aa1569 commit d21f8b54b24e08d1f2b7c6ae32a9bc75ac4fa9fc
Showing with 14 additions and 5 deletions.
  1. +12 −5 src/testdir/test_terminal.vim
  2. +2 −0 src/version.c
@@ -452,14 +452,21 @@ func Test_terminal_list_args()
endfunction
func Test_terminal_noblock()
let buf = term_start(&shell)
let g:buf = term_start(&shell)
for c in ['a','b','c','d','e','f','g','h','i','j','k']
call term_sendkeys(buf, 'echo ' . repeat(c, 5000) . "\<cr>")
call term_sendkeys(g:buf, 'echo ' . repeat(c, 5000) . "\<cr>")
endfor
call term_sendkeys(g:buf, "echo done\<cr>")
let g:lnum = term_getsize(g:buf)[0] - 1
call WaitFor('term_getline(g:buf, g:lnum) =~ "done"', 3000)
call assert_match('done', term_getline(g:buf, g:lnum))
let g:job = term_getjob(buf)
call Stop_shell_in_terminal(buf)
call term_wait(buf)
let g:job = term_getjob(g:buf)
call Stop_shell_in_terminal(g:buf)
call term_wait(g:buf)
unlet g:buf
unlet g:job
unlet g:lnum
bwipe
endfunc
View
@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
963,
/**/
962,
/**/

0 comments on commit d21f8b5

Please sign in to comment.