aboutsummaryrefslogtreecommitdiff
path: root/test/old/testdir/test_mapping.vim
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-08-21 16:08:48 +0800
committerGitHub <noreply@github.com>2023-08-21 16:08:48 +0800
commitdc01d68f27a0d80da62bac690e9ca4647bc70dd9 (patch)
treebe513a60ebce56c3d8bbb50f451029a4bba980f7 /test/old/testdir/test_mapping.vim
parentcc35352f65f823259675f84a915ee03d2423913e (diff)
parent02ca31979bed2b7e432401b23aaf7987a3f0badb (diff)
downloadrneovim-dc01d68f27a0d80da62bac690e9ca4647bc70dd9.tar.gz
rneovim-dc01d68f27a0d80da62bac690e9ca4647bc70dd9.tar.bz2
rneovim-dc01d68f27a0d80da62bac690e9ca4647bc70dd9.zip
Merge pull request #24818 from zeertzjq/vim-8.2.0186
vim-patch:8.1.2403,8.2.{0186,0195,0310,0454,0533,2908,2910,3518,4339}
Diffstat (limited to 'test/old/testdir/test_mapping.vim')
-rw-r--r--test/old/testdir/test_mapping.vim12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/old/testdir/test_mapping.vim b/test/old/testdir/test_mapping.vim
index f8c8bc95f9..40d0b3e6f7 100644
--- a/test/old/testdir/test_mapping.vim
+++ b/test/old/testdir/test_mapping.vim
@@ -278,9 +278,9 @@ func Test_map_timeout()
endfunc
func Test_map_timeout_with_timer_interrupt()
- if !has('job') || !has('timers')
- return
- endif
+ CheckFeature job
+ CheckFeature timers
+ let g:test_is_flaky = 1
" Confirm the timer invoked in exit_cb of the job doesn't disturb mapped key
" sequence.
@@ -418,9 +418,9 @@ func Test_error_in_map_expr()
" GC must not run during map-expr processing, which can make Vim crash.
call term_sendkeys(buf, '!')
- call term_wait(buf, 100)
+ call TermWait(buf, 50)
call term_sendkeys(buf, "\<CR>")
- call term_wait(buf, 100)
+ call TermWait(buf, 50)
call assert_equal('run', job_status(job))
call term_sendkeys(buf, ":qall!\<CR>")
@@ -1226,7 +1226,7 @@ func Test_map_cmdkey_visual_mode()
call feedkeys("v\<F4>", 'xt!')
call assert_equal(['v', 1, 12], [mode(1), col('v'), col('.')])
- " can invoke an opeartor, ending the visual mode
+ " can invoke an operator, ending the visual mode
let @a = ''
call feedkeys("\<F5>", 'xt!')
call assert_equal('n', mode(1))