diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-03-23 22:46:44 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-03-23 22:46:44 +0100 |
| commit | d7b7770f11c16cfac707b5048c61e722dcc903a6 (patch) | |
| tree | 74c39ba18a2cf46b2b9f47ed3ed740d200c5dc9f | |
| parent | 0df541963d406edd69d3ebe8de3912eb87b05414 (diff) | |
| download | vim-git-d7b7770f11c16cfac707b5048c61e722dcc903a6.tar.gz | |
patch 8.2.0438: terminal noblock test is very flaky on BSDv8.2.0438
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.
| -rw-r--r-- | src/testdir/test_terminal.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 6d7c78615..7e7aaff94 100644 --- 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) . "\<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 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 index eef374a67..82d93e529 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 */ /**/ + 438, +/**/ 437, /**/ 436, |