commit ea94c855163cf58a3389b5f3c54a0767c9e1be49
author Bram Moolenaar <Bram@vim.org> Fri Aug 16 21:47:27 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Fri Aug 16 21:47:27 2019 +0200
tree dedb9d73d8b14edd94363c01189644052c08078b
parent 427dddf014fea1326ea7f8c0951b0667dc037409

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.

src/testdir/runtest.vim

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 32c22fa..1df7fd9 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -322,6 +322,7 @@
       \ '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()',

src/testdir/test_mapping.vim

diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index 6b9fb9c..93a4d4b 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -298,7 +298,7 @@
   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')})

src/version.c

diff --git a/src/version.c b/src/version.c
index 66bd86f..cf96d64 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1860,
+/**/
     1859,
 /**/
     1858,