1
0
forked from aniani/vim

patch 8.2.0440: terminal noblock test is still very flaky on BSD

Problem:    Terminal noblock test is still very flaky on BSD.
Solution:   Increase the waiting time.
This commit is contained in:
Bram Moolenaar
2020-03-24 10:33:00 +01:00
parent 1082772f4c
commit d06dbf3f42
2 changed files with 7 additions and 2 deletions

View File

@@ -666,23 +666,26 @@ func Test_terminal_noblock()
" The shell or something else has a problem dealing with more than 1000 " The shell or something else has a problem dealing with more than 1000
" characters at the same time. " characters at the same time.
let len = 1000 let len = 1000
let wait_time = 15000
" NPFS is used in Windows, nonblocking mode does not work properly. " NPFS is used in Windows, nonblocking mode does not work properly.
elseif has('win32') elseif has('win32')
let len = 1 let len = 1
let wait_time = 5000
else else
let len = 5000 let len = 5000
let wait_time = 5000
endif endif
" Send a lot of text lines, should be buffered properly.
for c in split('abcdefghijklmnopqrstuvwxyz', '\zs') for c in split('abcdefghijklmnopqrstuvwxyz', '\zs')
call term_sendkeys(buf, 'echo ' . repeat(c, len) . "\<cr>") call term_sendkeys(buf, 'echo ' . repeat(c, len) . "\<cr>")
call term_wait(buf, 1)
endfor endfor
call term_sendkeys(buf, "echo done\<cr>") call term_sendkeys(buf, "echo done\<cr>")
" On MS-Windows there is an extra empty line below "done". Find "done" in " On MS-Windows there is an extra empty line below "done". Find "done" in
" the last-but-one or the last-but-two line. " the last-but-one or the last-but-two line.
let lnum = term_getsize(buf)[0] - 1 let lnum = term_getsize(buf)[0] - 1
call WaitForAssert({-> assert_match('done', term_getline(buf, lnum - 1) .. '//' .. term_getline(buf, lnum))}) call WaitForAssert({-> assert_match('done', term_getline(buf, lnum - 1) .. '//' .. term_getline(buf, lnum))}, wait_time)
let line = term_getline(buf, lnum) let line = term_getline(buf, lnum)
if line !~ 'done' if line !~ 'done'
let line = term_getline(buf, lnum - 1) let line = term_getline(buf, lnum - 1)

View File

@@ -738,6 +738,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 */
/**/
440,
/**/ /**/
439, 439,
/**/ /**/