summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-08 22:46:14 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-08 22:46:14 +0200
commit36d1c0fef4039fd4c91643c8ac107e78115158c9 (patch)
tree575707a32f2e124e9cc26bcf6b145b4eee769b47 /src
parent71dd9744cf3842cd45295010d2e5692da1651537 (diff)
patch 7.4.2186v7.4.2186
Problem: Timers test is flaky. Solution: Relax the sleep time check.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_timers.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index fb35f61fff..f334c17464 100644
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -27,7 +27,7 @@ func Test_repeat_three()
let timer = timer_start(50, 'MyHandler', {'repeat': 3})
let slept = WaitFor('g:val == 3')
call assert_equal(3, g:val)
- call assert_inrange(100, 250, slept)
+ call assert_inrange(80, 200, slept)
endfunc
func Test_repeat_many()
diff --git a/src/version.c b/src/version.c
index d53935e904..0a53260b17 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2186,
+/**/
2185,
/**/
2184,