aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-10-08 07:54:46 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-10-08 18:31:46 -0400
commit56bb5993d99592a9a45852e7e7f0e1c64257baf4 (patch)
tree68c351555ea41ed0996f043a2d95c1ff507e3c71 /src
parent818e794f12171ab0fd62152e7d197da7bc43535f (diff)
downloadrneovim-56bb5993d99592a9a45852e7e7f0e1c64257baf4.tar.gz
rneovim-56bb5993d99592a9a45852e7e7f0e1c64257baf4.tar.bz2
rneovim-56bb5993d99592a9a45852e7e7f0e1c64257baf4.zip
vim-patch:8.1.2405: matchadd_conceal test fails under valgrind
Problem: matchadd_conceal test fails under valgrind. Solution: Use WaitForAssert() and wait a bit longer. https://github.com/vim/vim/commit/1f9a028def327bd9bbfef375cb1283cd51e04678
Diffstat (limited to 'src')
-rw-r--r--src/nvim/testdir/test_matchadd_conceal.vim6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_matchadd_conceal.vim b/src/nvim/testdir/test_matchadd_conceal.vim
index ec9f4d5575..393e183ddb 100644
--- a/src/nvim/testdir/test_matchadd_conceal.vim
+++ b/src/nvim/testdir/test_matchadd_conceal.vim
@@ -294,12 +294,14 @@ func Test_cursor_column_in_concealed_line_after_window_scroll()
END
call writefile(lines, 'Xcolesearch')
let buf = RunVimInTerminal('Xcolesearch', {})
+ call term_wait(buf, 100)
" Jump to something that is beyond the bottom of the window,
" so there's a scroll down.
call term_sendkeys(buf, ":so %\<CR>")
+ call term_wait(buf, 100)
call term_sendkeys(buf, "/expr\<CR>")
- call term_wait(buf)
+ call term_wait(buf, 100)
" Are the concealed parts of the current line really hidden?
let cursor_row = term_scrape(buf, '.')->map({_, e -> e.chars})->join('')
@@ -332,7 +334,7 @@ func Test_cursor_column_in_concealed_line_after_leftcol_change()
call term_wait(buf)
" Are the concealed parts of the current line really hidden?
- call assert_equal('c', term_getline(buf, '.'))
+ call WaitForAssert({-> assert_equal('c', term_getline(buf, '.'))})
" BugFix check: Is the window's cursor column properly updated for conceal?
call assert_equal(1, term_getcursor(buf)[1])