commit 973d5304a44c974e74e43c3790f8919b7d4193b4
author Bram Moolenaar <Bram@vim.org> Fri Aug 16 10:51:10 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Fri Aug 16 10:51:10 2019 +0200
tree 498fe342a9fe97307b4ac9070e65d8022a5b6e8b
parent 52953194afccbcb6c2fd013b7a9e2cfbf202b9d0

patch 8.1.1854: now another timer test is flaky

Problem:    Now another timer test is flaky.
Solution:   Add test to list of flaky tests.

src/testdir/runtest.vim

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index fe02d88..7530bb9 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -336,6 +336,7 @@
       \ 'Test_repeat_many()',
       \ 'Test_repeat_three()',
       \ 'Test_server_crash()',
+      \ 'Test_stop_all_in_callback()',
       \ 'Test_terminal_ansicolors_default()',
       \ 'Test_terminal_ansicolors_func()',
       \ 'Test_terminal_ansicolors_global()',

src/version.c

diff --git a/src/version.c b/src/version.c
index 38290c6..e497399 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1854,
+/**/
     1853,
 /**/
     1852,