thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2648: terminal resize test sometimes hangs

Browse Source 
Problem:    Terminal resize test sometimes hangs.
Solution:   Wait for the shell to display a prompt and other output.
This commit is contained in:
Bram Moolenaar
2021-03-23 19:22:12 +01:00
parent f4a2ed0714
commit c54f347d63
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/testdir/test_terminal2.vim
View File

@@ -246,6 +246,10 @@ func Test_terminal_resize()
set statusline=x set statusline=x
terminal terminal
call assert_equal(2, winnr('$')) call assert_equal(2, winnr('$'))
let buf = bufnr()
" Wait for the shell to display a prompt
call WaitForAssert({-> assert_notequal('', term_getline(buf, 1))})
" Fill the terminal with text. " Fill the terminal with text.
if has('win32') if has('win32')
@@ -253,6 +257,9 @@ func Test_terminal_resize()
else else
call feedkeys("ls\<CR>", 'xt') call feedkeys("ls\<CR>", 'xt')
endif endif
" Wait for some output
call WaitForAssert({-> assert_notequal('', term_getline(buf, 3))})
" Go to Terminal-Normal mode for a moment. " Go to Terminal-Normal mode for a moment.
call feedkeys("\<C-W>N", 'xt') call feedkeys("\<C-W>N", 'xt')
" Open a new window " Open a new window
@@ -263,6 +270,7 @@ func Test_terminal_resize()
close close
call assert_equal(2, winnr('$')) call assert_equal(2, winnr('$'))
call feedkeys("exit\<CR>", 'xt') call feedkeys("exit\<CR>", 'xt')
call TermWait(buf)
set statusline& set statusline&
endfunc endfunc

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2648,
/**/ /**/
2647, 2647,
/**/ /**/