changeset 17726:586558396b7e v8.1.1860

patch 8.1.1860: map timeout test is flaky commit https://github.com/vim/vim/commit/ea94c855163cf58a3389b5f3c54a0767c9e1be49 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Aug 16 21:47:27 2019 +0200 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.
author Bram Moolenaar <Bram@vim.org>
date Fri, 16 Aug 2019 22:00:03 +0200
parents 94ae85bba7cc
children 145b465ffd33
files src/testdir/runtest.vim src/testdir/test_mapping.vim src/version.c
diffstat 3 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -322,6 +322,7 @@ let s:flaky_tests = [
       \ 'Test_diff_screen()',
       \ 'Test_exit_callback()',
       \ 'Test_exit_callback_interval()',
+      \ 'Test_map_timeout_with_timer_interrupt()',
       \ 'Test_nb_basic()',
       \ 'Test_open_delay()',
       \ 'Test_out_cb()',
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -298,7 +298,7 @@ func Test_map_timeout_with_timer_interru
   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')})
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1860,
+/**/
     1859,
 /**/
     1858,