# HG changeset patch # User Bram Moolenaar # Date 1585000804 -3600 # Node ID ed157b5edad0981036cc7c9867421fdc8ffbae56 # Parent 1616cb679e620d167f466ed5710bf13fddd3b8c7 patch 8.2.0438: terminal noblock test is very flaky on BSD Commit: https://github.com/vim/vim/commit/d7b7770f11c16cfac707b5048c61e722dcc903a6 Author: Bram Moolenaar Date: Mon Mar 23 22:46:44 2020 +0100 patch 8.2.0438: terminal noblock test is very flaky on BSD 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. diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -675,13 +675,14 @@ func Test_terminal_noblock() for c in split('abcdefghijklmnopqrstuvwxyz', '\zs') call term_sendkeys(buf, 'echo ' . repeat(c, len) . "\") + call term_wait(buf, 1) endfor call term_sendkeys(buf, "echo done\") " On MS-Windows there is an extra empty line below "done". Find "done" in " the last-but-one or the last-but-two line. 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) if line !~ 'done' let line = term_getline(buf, lnum - 1) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 438, +/**/ 437, /**/ 436,