diff options
| author | Jurica Bradaric <jbradaric@gmail.com> | 2017-03-20 21:12:31 +0100 |
|---|---|---|
| committer | Jurica Bradaric <jbradaric@gmail.com> | 2017-03-20 21:15:56 +0100 |
| commit | 4f69a8fb8854698adb2de8956ad0d86ff35a6f68 (patch) | |
| tree | 5e156b0fbd7995a998b4c6fa846821787571488c | |
| parent | 3558f89d22faad613e0049592d2187ad35f5bec8 (diff) | |
| download | rneovim-4f69a8fb8854698adb2de8956ad0d86ff35a6f68.tar.gz rneovim-4f69a8fb8854698adb2de8956ad0d86ff35a6f68.tar.bz2 rneovim-4f69a8fb8854698adb2de8956ad0d86ff35a6f68.zip | |
vim-patch:7.4.2242
Problem: Timer test sometimes fails.
Solution: Increase the maximum time for callback timer test.
https://github.com/vim/vim/commit/17f1347b867cbcc0ce380bf9a2466b4c31896f04
| -rw-r--r-- | src/nvim/testdir/test_timers.vim | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim index 8829b5de59..db10f351ae 100644 --- a/src/nvim/testdir/test_timers.vim +++ b/src/nvim/testdir/test_timers.vim @@ -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, 100, slept) + call assert_inrange(50, 130, slept) else call assert_inrange(20, 100, slept) endif diff --git a/src/nvim/version.c b/src/nvim/version.c index b7516e443a..91c37658aa 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -199,7 +199,7 @@ static int included_patches[] = { // 2245, // 2244, // 2243 NA - // 2242, + 2242, 2241, 2240, // 2239, |