mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-08 19:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: share implementation of testdir/load.vim

Browse Source 
Also, don't compute load factor unless load_adjust() was called, it
slows down the test suite.

ref #9292
This commit is contained in:
Justin M. Keyes
2019-05-18 09:50:44 +02:00
parent bba75eb184
commit 7669fc1e9b
3 changed files with 15 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/testdir/load.vim
View File

@@ -1,3 +1,5 @@
" Also used by: test/functional/helpers.lua
function! s:load_factor() abort
let timeout = 200
let times = []
@@ -23,8 +25,8 @@ function! s:load_factor() abort
endfunction
" Compute load factor only once.
let s:load_factor = s:load_factor()
let g:test_load_factor = s:load_factor()
function! LoadAdjust(num) abort
return float2nr(ceil(a:num * s:load_factor))
return float2nr(ceil(a:num * g:test_load_factor))
endfunction

14
src/nvim/testdir/test_timers.vim
View File

@@ -15,17 +15,13 @@ func MyHandlerWithLists(lists, timer)
let x = string(a:lists)
endfunc
func s:assert_inrange(lower, upper, actual)
return assert_inrange(a:lower, LoadAdjust(a:upper), a:actual)
endfunc
func Test_oneshot()
let g:val = 0
let timer = timer_start(50, 'MyHandler')
let slept = WaitFor('g:val == 1')
call assert_equal(1, g:val)
if has('reltime')
call s:assert_inrange(40, 120, slept)
call assert_inrange(40, LoadAdjust(120), slept)
else
call assert_inrange(20, 120, slept)
endif
@@ -37,7 +33,7 @@ func Test_repeat_three()
let slept = WaitFor('g:val == 3')
call assert_equal(3, g:val)
if has('reltime')
call s:assert_inrange(120, 250, slept)
call assert_inrange(120, LoadAdjust(250), slept)
else
call assert_inrange(80, 200, slept)
endif
@@ -52,7 +48,7 @@ func Test_repeat_many()
endif
sleep 200m
call timer_stop(timer)
call s:assert_inrange((has('mac') ? 1 : 2), 4, g:val)
call assert_inrange((has('mac') ? 1 : 2), LoadAdjust(4), g:val)
endfunc
func Test_with_partial_callback()
@@ -66,7 +62,7 @@ func Test_with_partial_callback()
let slept = WaitFor('g:val == 1')
call assert_equal(1, g:val)
if has('reltime')
call s:assert_inrange(40, 130, slept)
call assert_inrange(40, LoadAdjust(130), slept)
else
call assert_inrange(20, 100, slept)
endif
@@ -129,7 +125,7 @@ func Test_paused()
let slept = WaitFor('g:val == 1')
call assert_equal(1, g:val)
if has('reltime')
call s:assert_inrange(0, 140, slept)
call assert_inrange(0, LoadAdjust(140), slept)
else
call assert_inrange(0, 10, slept)
endif