# HG changeset patch # User Bram Moolenaar # Date 1585043104 -3600 # Node ID 0d1088e3c53f80907c3065722cdd91b01c92acf1 # Parent 4ee37e23b78214d9b85e9f5de817fe1478c0eb50 patch 8.2.0440: terminal noblock test is still very flaky on BSD Commit: https://github.com/vim/vim/commit/d06dbf3f42c8a8a3967905dd2f2a31077af15438 Author: Bram Moolenaar Date: Tue Mar 24 10:33:00 2020 +0100 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. 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 @@ -666,23 +666,26 @@ func Test_terminal_noblock() " The shell or something else has a problem dealing with more than 1000 " characters at the same time. let len = 1000 + let wait_time = 15000 " NPFS is used in Windows, nonblocking mode does not work properly. elseif has('win32') let len = 1 + let wait_time = 5000 else let len = 5000 + let wait_time = 5000 endif + " Send a lot of text lines, should be buffered properly. 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 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) 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 */ /**/ + 440, +/**/ 439, /**/ 438,