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

patch 8.2.0438: terminal noblock test is very flaky on BSD

Browse Source 
Problem:    Terminal noblock test is very flaky on BSD.
Solution:   Change WaitFor() to WaitForAssert() to be able to see why it
            failed.  Add a short wait in between sending keys.
This commit is contained in:
Bram Moolenaar
2020-03-23 22:46:44 +01:00
parent 0df541963d
commit d7b7770f11
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/testdir/test_terminal.vim
View File

@@ -675,13 +675,14 @@ func Test_terminal_noblock()
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 WaitFor({-> term_getline(buf, lnum) =~ "done" || term_getline(buf, lnum - 1) =~ "done"}, 10000) call WaitForAssert({-> assert_match('done', term_getline(buf, lnum - 1) .. '//' .. term_getline(buf, lnum))})
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)

2
src/version.c
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 */
/**/
438,
/**/ /**/
437, 437,
/**/ /**/