diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-09-02 11:59:10 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-09-02 12:00:33 -0400 |
| commit | 55c66d6c19ae46a0f6590be93a9692c2cb4f10e4 (patch) | |
| tree | a2cc5ea0621e7da82b79d235a46076503efd5ee9 /src | |
| parent | cb339ca0fb27976daca1909557d2862be9629d0e (diff) | |
| download | rneovim-55c66d6c19ae46a0f6590be93a9692c2cb4f10e4.tar.gz rneovim-55c66d6c19ae46a0f6590be93a9692c2cb4f10e4.tar.bz2 rneovim-55c66d6c19ae46a0f6590be93a9692c2cb4f10e4.zip | |
vim-patch:8.0.1697: various tests are still a bit flaky
Problem: Various tests are still a bit flaky.
Solution: Increase the default wait time to five seconds.
https://github.com/vim/vim/commit/769e9d21ac3e8dff43b9ef5e46cdc4523833b51e
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/shared.vim | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test_clientserver.vim | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_quotestar.vim | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/nvim/testdir/shared.vim b/src/nvim/testdir/shared.vim index bcd6d021a0..df512e2e3f 100644 --- a/src/nvim/testdir/shared.vim +++ b/src/nvim/testdir/shared.vim @@ -133,7 +133,7 @@ func s:kill_server(cmd) endif 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. " " 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 " more than the actual waiting time. Without +reltime it can also be less. 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 if has('reltime') let start = reltime() diff --git a/src/nvim/testdir/test_clientserver.vim b/src/nvim/testdir/test_clientserver.vim index f03a6903c1..813cb338a5 100644 --- a/src/nvim/testdir/test_clientserver.vim +++ b/src/nvim/testdir/test_clientserver.vim @@ -32,7 +32,7 @@ func Test_client_server() " Takes a short while for the server to be active. " When using valgrind it takes much longer. - call WaitFor('serverlist() =~ "' . name . '"', 5000) + call WaitFor('serverlist() =~ "' . name . '"') call assert_match(name, serverlist()) call remote_foreground(name) diff --git a/src/nvim/testdir/test_quotestar.vim b/src/nvim/testdir/test_quotestar.vim index 3a8fdef3a3..b83fbe40e8 100644 --- a/src/nvim/testdir/test_quotestar.vim +++ b/src/nvim/testdir/test_quotestar.vim @@ -74,20 +74,20 @@ func Do_test_quotestar_for_x11() " by the server. let @* = 'no' 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. 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. - call WaitFor('@* == "yes"', 3000) + call WaitFor('@* == "yes"') " Handle the large selection over 262040 byte. let length = 262044 let sample = 'a' . repeat('b', length - 2) . 'c' 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) call assert_equal(length, len(res)) " Check length to prevent a large amount of output at assertion failure. |