diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-06-21 17:40:47 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-06-21 17:40:47 +0100 |
| commit | 37bb3b111d08ce420e3cfd6ea3da3ed7428fbed1 (patch) | |
| tree | 1bc58ef6ee24f3e63a9e943f8a0a5c6369a55e9f /src/testdir/test_popup.vim | |
| parent | fa04eae5a5b9394079bde2d37ce6f9f8a5567d48 (diff) | |
patch 8.2.5143: some tests fail when using valgrindv8.2.5143
Problem: Some tests fail when using valgrind. Spurious leak reports.
Solution: Use WaitForAssert(). Avoid failing fork/exec. Skip tests where a
job is killed when running valgrind.
Diffstat (limited to 'src/testdir/test_popup.vim')
| -rw-r--r-- | src/testdir/test_popup.vim | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim index c389f63f55..5fb7e82229 100644 --- a/src/testdir/test_popup.vim +++ b/src/testdir/test_popup.vim @@ -1177,13 +1177,12 @@ func Test_pum_rightleft() END call writefile(lines, 'Xtest1') let buf = RunVimInTerminal('--cmd "set rightleft" Xtest1', {}) - call term_wait(buf) call term_sendkeys(buf, "Go\<C-P>") call VerifyScreenDump(buf, 'Test_pum_rightleft_01', {'rows': 8}) call term_sendkeys(buf, "\<C-P>\<C-Y>") - call term_wait(buf) + call TermWait(buf, 30) redraw! - call assert_match('\s*miv', Screenline(5)) + call WaitForAssert({-> assert_match('\s*miv', Screenline(5))}) " Test for expanding tabs to spaces in the popup menu let lines =<< trim END @@ -1193,15 +1192,15 @@ func Test_pum_rightleft() END call writefile(lines, 'Xtest2') call term_sendkeys(buf, "\<Esc>:e! Xtest2\<CR>") - call term_wait(buf) + call TermWait(buf, 30) call term_sendkeys(buf, "Goone\<C-X>\<C-L>") - call term_wait(buf) + call TermWait(buf, 30) redraw! call VerifyScreenDump(buf, 'Test_pum_rightleft_02', {'rows': 7}) call term_sendkeys(buf, "\<C-Y>") - call term_wait(buf) + call TermWait(buf, 30) redraw! - call assert_match('\s*eerht eno', Screenline(4)) + call WaitForAssert({-> assert_match('\s*eerht eno', Screenline(4))}) call StopVimInTerminal(buf) call delete('Xtest1') @@ -1218,15 +1217,15 @@ func Test_pum_scrollbar() END call writefile(lines, 'Xtest1') let buf = RunVimInTerminal('--cmd "set pumheight=2" Xtest1', {}) - call term_wait(buf) + call TermWait(buf) call term_sendkeys(buf, "Go\<C-P>\<C-P>\<C-P>") call VerifyScreenDump(buf, 'Test_pum_scrollbar_01', {'rows': 7}) call term_sendkeys(buf, "\<C-E>\<Esc>dd") - call term_wait(buf) + call TermWait(buf) if has('rightleft') call term_sendkeys(buf, ":set rightleft\<CR>") - call term_wait(buf) + call TermWait(buf) call term_sendkeys(buf, "Go\<C-P>\<C-P>\<C-P>") call VerifyScreenDump(buf, 'Test_pum_scrollbar_02', {'rows': 7}) endif |