diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-06-19 15:22:36 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-06-19 15:22:36 +0100 |
| commit | c5382b667ac4b69ddff5b5bc562386843bc9c07b (patch) | |
| tree | 6018e540c1b1c41a034d81dcb665c09059de1958 | |
| parent | 1f30caff8b63beda75a5dcd15ffe3e9e818ed483 (diff) | |
| download | vim-git-c5382b667ac4b69ddff5b5bc562386843bc9c07b.tar.gz | |
patch 8.2.5130: edit test for mode message fails when using valgrindv8.2.5130
Problem: Edit test for mode message fails when using valgrind.
Solution: Use WaitForAssert(). Run beep test later.
| -rw-r--r-- | src/testdir/test_edit.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim index d56ee622e..4c5c957be 100644 --- a/src/testdir/test_edit.vim +++ b/src/testdir/test_edit.vim @@ -1860,11 +1860,9 @@ func Test_edit_insertmode_ex_edit() call writefile(lines, 'Xtest_edit_insertmode_ex_edit') let buf = RunVimInTerminal('-S Xtest_edit_insertmode_ex_edit', #{rows: 6}) - call TermWait(buf, 50) - call assert_match('^-- INSERT --\s*$', term_getline(buf, 6)) + call WaitForAssert({-> assert_match('^-- INSERT --\s*$', term_getline(buf, 6))}) call term_sendkeys(buf, "\<C-B>\<C-L>") - call TermWait(buf, 50) - call assert_notmatch('^-- INSERT --\s*$', term_getline(buf, 6)) + call WaitForAssert({-> assert_notmatch('^-- INSERT --\s*$', term_getline(buf, 6))}) " clean up call StopVimInTerminal(buf) @@ -1872,14 +1870,16 @@ func Test_edit_insertmode_ex_edit() endfunc " Pressing escape in 'insertmode' should beep -func Test_edit_insertmode_esc_beeps() +" FIXME: Execute this later, when using valgrind it makes the next test +" Test_edit_insertmode_ex_edit() fail. +func Test_z_edit_insertmode_esc_beeps() new set insertmode call assert_beeps("call feedkeys(\"one\<Esc>\", 'xt')") set insertmode& - " unsupported CTRL-G command should beep in insert mode. + " unsupported "CTRL-G l" command should beep in insert mode. call assert_beeps("normal i\<C-G>l") - close! + bwipe! endfunc " Test for 'hkmap' and 'hkmapp' diff --git a/src/version.c b/src/version.c index d03808754..60c1817dd 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5130, +/**/ 5129, /**/ 5128, |