diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-04-06 08:54:30 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-04-06 08:55:37 -0400 |
| commit | 6a6bbbc6d8fa79a0c14fb913baa3ba2d7046419c (patch) | |
| tree | 46c14d154cd4f27e145be0ccc4d82cbad011b0db /src | |
| parent | bb54d921aaf85f0393c1ba10585560056f7f4ec8 (diff) | |
| download | rneovim-6a6bbbc6d8fa79a0c14fb913baa3ba2d7046419c.tar.gz rneovim-6a6bbbc6d8fa79a0c14fb913baa3ba2d7046419c.tar.bz2 rneovim-6a6bbbc6d8fa79a0c14fb913baa3ba2d7046419c.zip | |
vim-patch:7.4.2281
Problem: Timer test fails sometimes.
Solution: Reduce minimum time by 1 msec.
https://github.com/vim/vim/commit/0426bae2abede764d0dd366a28663d1c6e6ab0fe
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test_timers.vim | 6 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim index db10f351ae..16c70b166b 100644 --- a/src/nvim/testdir/test_timers.vim +++ b/src/nvim/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/nvim/version.c b/src/nvim/version.c index ca520c7af5..3944551cb4 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -160,7 +160,7 @@ static const int included_patches[] = { 2284, 2283, // 2282 NA - // 2281 NA + 2281, 2280, 2279, // 2278 NA |