summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-08-15 23:42:21 +0200
committerBram Moolenaar <Bram@vim.org>2019-08-15 23:42:21 +0200
commit7e6feb9eeb095ec424430ff4332c77f70372ce62 (patch)
treeaea3a4a5487ce39711f5b8777207ce82fac59475
parent28e67e0c1496b7bb166a0acfb176690f219101ca (diff)
patch 8.1.1852: timers test is flakyv8.1.1852
Problem: Timers test is flaky. Solution: Accept a larger count. Add test to list of flaky tests.
-rw-r--r--src/testdir/runtest.vim1
-rw-r--r--src/testdir/test_timers.vim2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 9b41b46f10..fe02d889c5 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -333,6 +333,7 @@ let s:flaky_tests = [
\ 'Test_quotestar()',
\ 'Test_raw_one_time_callback()',
\ 'Test_reltime()',
+ \ 'Test_repeat_many()',
\ 'Test_repeat_three()',
\ 'Test_server_crash()',
\ 'Test_terminal_ansicolors_default()',
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index 367e46f947..caeb230149 100644
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -43,7 +43,7 @@ func Test_repeat_many()
let timer = timer_start(50, 'MyHandler', {'repeat': -1})
sleep 200m
call timer_stop(timer)
- call assert_inrange(2, 4, g:val)
+ call assert_inrange(2, 5, g:val)
endfunc
func Test_with_partial_callback()
diff --git a/src/version.c b/src/version.c
index 93867b87dc..abbb3b0e5d 100644
--- 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 */
/**/
+ 1852,
+/**/
1851,
/**/
1850,