aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-12-04 18:33:04 +0800
committerGitHub <noreply@github.com>2022-12-04 18:33:04 +0800
commitb866d8d2e7cf4c2f00b1adc997188f1d04c13fa1 (patch)
tree0b15fe2ef57cedf4f4cf568222cd1c46bf3ffd06
parent9263f17d0d741f52e9fafae9779ddaa4e3441fcc (diff)
downloadrneovim-b866d8d2e7cf4c2f00b1adc997188f1d04c13fa1.tar.gz
rneovim-b866d8d2e7cf4c2f00b1adc997188f1d04c13fa1.tar.bz2
rneovim-b866d8d2e7cf4c2f00b1adc997188f1d04c13fa1.zip
vim-patch:9.0.0610: global interrupt test fails when run under valgrind (#21285)
Problem: Global interrupt test fails when run under valgrind. Solution: Use TermWait(). https://github.com/vim/vim/commit/859ea4bc76699232e41aea0f308463bab887b0c1 Co-authored-by: Bram Moolenaar <Bram@vim.org>
-rw-r--r--src/nvim/testdir/test_global.vim5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_global.vim b/src/nvim/testdir/test_global.vim
index bbfe374f51..8fb4ee0cfa 100644
--- a/src/nvim/testdir/test_global.vim
+++ b/src/nvim/testdir/test_global.vim
@@ -91,6 +91,7 @@ endfunc
" Test for interrupting :global using Ctrl-C
func Test_interrupt_global()
CheckRunVimInTerminal
+
let lines =<< trim END
cnoremap ; <Cmd>sleep 10<CR>
call setline(1, repeat(['foo'], 5))
@@ -100,14 +101,14 @@ func Test_interrupt_global()
call term_sendkeys(buf, ":g/foo/norm :\<C-V>;\<CR>")
" Wait for :sleep to start
- call term_wait(buf)
+ call TermWait(buf, 100)
call term_sendkeys(buf, "\<C-C>")
call WaitForAssert({-> assert_match('Interrupted', term_getline(buf, 6))}, 1000)
" Also test in Ex mode
call term_sendkeys(buf, "gQg/foo/norm :\<C-V>;\<CR>")
" Wait for :sleep to start
- call term_wait(buf)
+ call TermWait(buf, 100)
call term_sendkeys(buf, "\<C-C>")
call WaitForAssert({-> assert_match('Interrupted', term_getline(buf, 5))}, 1000)