aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-08-16 21:22:16 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-08-16 21:23:25 -0400
commitae95a62675c00dd3869d31964cdbb1ce284a3075 (patch)
tree152e09e50ce83e028fcd435aad54b773840325df /src
parent0455af00e656b0f18854211e4547221178d64af8 (diff)
downloadrneovim-ae95a62675c00dd3869d31964cdbb1ce284a3075.tar.gz
rneovim-ae95a62675c00dd3869d31964cdbb1ce284a3075.tar.bz2
rneovim-ae95a62675c00dd3869d31964cdbb1ce284a3075.zip
vim-patch:8.1.1860: map timeout test is flaky
Problem: Map timeout test is flaky. Solution: Add test to list of flaky tests. Increase timeout. https://github.com/vim/vim/commit/ea94c855163cf58a3389b5f3c54a0767c9e1be49
Diffstat (limited to 'src')
-rw-r--r--src/nvim/testdir/runtest.vim1
-rw-r--r--src/nvim/testdir/test_mapping.vim2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index ce7d3b7ee4..4eddad8ad5 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -280,6 +280,7 @@ endif
let s:flaky_tests = [
\ 'Test_cursorhold_insert()',
\ 'Test_exit_callback_interval()',
+ \ 'Test_map_timeout_with_timer_interrupt()',
\ 'Test_oneshot()',
\ 'Test_out_cb()',
\ 'Test_paused()',
diff --git a/src/nvim/testdir/test_mapping.vim b/src/nvim/testdir/test_mapping.vim
index 5e080fc55e..7fdb3324ce 100644
--- a/src/nvim/testdir/test_mapping.vim
+++ b/src/nvim/testdir/test_mapping.vim
@@ -288,7 +288,7 @@ func Test_map_timeout_with_timer_interrupt()
let g:val = 0
nnoremap \12 :let g:val = 1<CR>
nnoremap \123 :let g:val = 2<CR>
- set timeout timeoutlen=100
+ set timeout timeoutlen=200
func ExitCb(job, status)
let g:timer = timer_start(1, {_ -> feedkeys("3\<Esc>", 't')})