IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.1697: various tests are still a bit flaky

Browse Source 
Problem:    Various tests are still a bit flaky.
Solution:   Increase the default wait time to five seconds.
769e9d21ac
This commit is contained in:
Jan Edmund Lazo 2019-09-02 11:59:10 -04:00
parent cb339ca0fb
commit 55c66d6c19
No known key found for this signature in database
GPG Key ID: 64915E6E9F735B15
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/testdir/shared.vim
View File

@ -133,7 +133,7 @@ func s:kill_server(cmd)
endif endif
endfunc endfunc
" Wait for up to a second for "expr" to become true. "expr" can be a " Wait for up to five seconds for "expr" to become true. "expr" can be a
" stringified expression to evaluate, or a funcref without arguments. " stringified expression to evaluate, or a funcref without arguments.
" "
" A second argument can be used to specify a different timeout in msec. " A second argument can be used to specify a different timeout in msec.
@ -141,7 +141,7 @@ endfunc
" Return time slept in milliseconds. With the +reltime feature this can be " Return time slept in milliseconds. With the +reltime feature this can be
" more than the actual waiting time. Without +reltime it can also be less. " more than the actual waiting time. Without +reltime it can also be less.
func WaitFor(expr, ...) func WaitFor(expr, ...)
let timeout = get(a:000, 0, 1000) let timeout = get(a:000, 0, 5000)
" using reltime() is more accurate, but not always available " using reltime() is more accurate, but not always available
if has('reltime') if has('reltime')
let start = reltime() let start = reltime()

2
src/nvim/testdir/test_clientserver.vim
View File

@ -32,7 +32,7 @@ func Test_client_server()
" Takes a short while for the server to be active. " Takes a short while for the server to be active.
" When using valgrind it takes much longer. " When using valgrind it takes much longer.
call WaitFor('serverlist() =~ "' . name . '"', 5000) call WaitFor('serverlist() =~ "' . name . '"')
call assert_match(name, serverlist()) call assert_match(name, serverlist())
call remote_foreground(name) call remote_foreground(name)

8
src/nvim/testdir/test_quotestar.vim
View File

@ -74,20 +74,20 @@ func Do_test_quotestar_for_x11()
" by the server. " by the server.
let @* = 'no' let @* = 'no'
call remote_foreground(name) call remote_foreground(name)
call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "no"', 3000) call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "no"')
" Set the * register on the server. " Set the * register on the server.
call remote_send(name, ":let @* = 'yes'\<CR>") call remote_send(name, ":let @* = 'yes'\<CR>")
call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "yes"', 3000) call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "yes"')
" Check that the *-register of this vim instance is changed as expected. " Check that the *-register of this vim instance is changed as expected.
call WaitFor('@* == "yes"', 3000) call WaitFor('@* == "yes"')
" Handle the large selection over 262040 byte. " Handle the large selection over 262040 byte.
let length = 262044 let length = 262044
let sample = 'a' . repeat('b', length - 2) . 'c' let sample = 'a' . repeat('b', length - 2) . 'c'
let @* = sample let @* = sample
call WaitFor('remote_expr("' . name . '", "len(@*) >= ' . length . '", "", 1)', 3000) call WaitFor('remote_expr("' . name . '", "len(@*) >= ' . length . '", "", 1)')
let res = remote_expr(name, "@*", "", 2) let res = remote_expr(name, "@*", "", 2)
call assert_equal(length, len(res)) call assert_equal(length, len(res))
" Check length to prevent a large amount of output at assertion failure. " Check length to prevent a large amount of output at assertion failure.