# HG changeset patch # User Christian Brabandt # Date 1472393705 -7200 # Node ID f132b956e9b51e7aededfd7282ecb7a5441760ee # Parent 267d27086c1257a7273777937173e42375c1afa7 commit https://github.com/vim/vim/commit/0426bae2abede764d0dd366a28663d1c6e6ab0fe Author: Bram Moolenaar Date: Sun Aug 28 16:06:05 2016 +0200 patch 7.4.2281 Problem: Timer test fails sometimes. Solution: Reduce minimum time by 1 msec. diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim --- a/src/testdir/test_timers.vim +++ b/src/testdir/test_timers.vim @@ -20,7 +20,7 @@ func Test_oneshot() let slept = WaitFor('g:val == 1') call assert_equal(1, g:val) if has('reltime') - call assert_inrange(50, 100, slept) + call assert_inrange(49, 100, slept) else call assert_inrange(20, 100, slept) endif @@ -32,7 +32,7 @@ func Test_repeat_three() let slept = WaitFor('g:val == 3') call assert_equal(3, g:val) if has('reltime') - call assert_inrange(150, 250, slept) + call assert_inrange(149, 250, slept) else call assert_inrange(80, 200, slept) endif @@ -57,7 +57,7 @@ func Test_with_partial_callback() let slept = WaitFor('g:val == 1') call assert_equal(1, g:val) if has('reltime') - call assert_inrange(50, 130, slept) + call assert_inrange(49, 130, slept) else call assert_inrange(20, 100, slept) endif diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 2281, +/**/ 2280, /**/ 2279,