diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-03-24 10:33:00 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-03-24 10:33:00 +0100 |
| commit | d06dbf3f42c8a8a3967905dd2f2a31077af15438 (patch) | |
| tree | 422113893df8811183c80d4beed9f95692486bc7 | |
| parent | 1082772f4c29bceebf5eb06f7e1f01bd143a2131 (diff) | |
| download | vim-git-d06dbf3f42c8a8a3967905dd2f2a31077af15438.tar.gz | |
patch 8.2.0440: terminal noblock test is still very flaky on BSDv8.2.0440
Problem: Terminal noblock test is still very flaky on BSD.
Solution: Increase the waiting time.
| -rw-r--r-- | src/testdir/test_terminal.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 7e7aaff94..cfbf67a41 100644 --- 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) . "\<cr>") - call term_wait(buf, 1) endfor call term_sendkeys(buf, "echo done\<cr>") " 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 index 009266b94..7e9c68cb4 100644 --- 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, |