aboutsummaryrefslogtreecommitdiff
path: root/test/old/testdir/test_functions.vim
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-08-21 14:59:52 +0800
committerzeertzjq <zeertzjq@outlook.com>2023-08-21 15:31:21 +0800
commitff801ce7f728ea51cec3328328ac41d98d545725 (patch)
tree77f32a689456eb082f39f585e0b16a97cd71ed73 /test/old/testdir/test_functions.vim
parentff37916b47658d16cdec6932aa8aaa3b5af674b7 (diff)
downloadrneovim-ff801ce7f728ea51cec3328328ac41d98d545725.tar.gz
rneovim-ff801ce7f728ea51cec3328328ac41d98d545725.tar.bz2
rneovim-ff801ce7f728ea51cec3328328ac41d98d545725.zip
vim-patch:8.2.0533: tests using term_wait() can still be flaky
Problem: Tests using term_wait() can still be flaky. Solution: Increase the wait time when rerunning a test. (James McCoy, closes vim/vim#5899) Halve the initial times to make tests run faster when there is no rerun. https://github.com/vim/vim/commit/6a2c5a7dd5c9215cc030d5ea6e4616d782c091dd Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'test/old/testdir/test_functions.vim')
-rw-r--r--test/old/testdir/test_functions.vim19
1 files changed, 5 insertions, 14 deletions
diff --git a/test/old/testdir/test_functions.vim b/test/old/testdir/test_functions.vim
index ba8134cc2d..95c132a5c0 100644
--- a/test/old/testdir/test_functions.vim
+++ b/test/old/testdir/test_functions.vim
@@ -2568,15 +2568,6 @@ endfunc
func Test_state()
CheckRunVimInTerminal
- " In the first run try a short wait time. If the test fails retry with a
- " longer wait time.
- if g:run_nr == 1
- let wait_time = 50
- elseif g:run_nr == 2
- let wait_time = 200
- else
- let wait_time = 500
- endif
let getstate = ":echo 'state: ' .. g:state .. '; mode: ' .. g:mode\<CR>"
let lines =<< trim END
@@ -2598,27 +2589,27 @@ func Test_state()
" Using a timer callback
call term_sendkeys(buf, ":call RunTimer()\<CR>")
- call term_wait(buf, wait_time)
+ call TermWait(buf, 25)
call term_sendkeys(buf, getstate)
call WaitForAssert({-> assert_match('state: c; mode: n', term_getline(buf, 6))}, 1000)
" Halfway a mapping
call term_sendkeys(buf, ":call RunTimer()\<CR>;")
- call term_wait(buf, wait_time)
+ call TermWait(buf, 25)
call term_sendkeys(buf, ";")
call term_sendkeys(buf, getstate)
call WaitForAssert({-> assert_match('state: mSc; mode: n', term_getline(buf, 6))}, 1000)
" Insert mode completion (bit slower on Mac)
call term_sendkeys(buf, ":call RunTimer()\<CR>Got\<C-N>")
- call term_wait(buf, wait_time)
+ call TermWait(buf, 25)
call term_sendkeys(buf, "\<Esc>")
call term_sendkeys(buf, getstate)
call WaitForAssert({-> assert_match('state: aSc; mode: i', term_getline(buf, 6))}, 1000)
" Autocommand executing
call term_sendkeys(buf, ":set filetype=foobar\<CR>")
- call term_wait(buf, wait_time)
+ call TermWait(buf, 25)
call term_sendkeys(buf, getstate)
call WaitForAssert({-> assert_match('state: xS; mode: n', term_getline(buf, 6))}, 1000)
@@ -2626,7 +2617,7 @@ func Test_state()
" messages scrolled
call term_sendkeys(buf, ":call RunTimer()\<CR>:echo \"one\\ntwo\\nthree\"\<CR>")
- call term_wait(buf, wait_time)
+ call TermWait(buf, 25)
call term_sendkeys(buf, "\<CR>")
call term_sendkeys(buf, getstate)
call WaitForAssert({-> assert_match('state: Scs; mode: r', term_getline(buf, 6))}, 1000)