patch 8.2.5130: edit test for mode message fails when using valgrind
Problem: Edit test for mode message fails when using valgrind.
Solution: Use WaitForAssert(). Run beep test later.
diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim
index d56ee62..4c5c957 100644
--- a/src/testdir/test_edit.vim
+++ b/src/testdir/test_edit.vim
@@ -1860,11 +1860,9 @@
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 @@
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 d038087..60c1817 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5130,
+/**/
5129,
/**/
5128,