forked from aniani/vim
patch 8.2.1937: Vim9: test for confirm modifier fails in some situations
Problem: Vim9: test for confirm modifier fails in some situations. Solution: Add a short wait. Handle failure better.
This commit is contained in:
@@ -147,8 +147,13 @@ func StopVimInTerminal(buf)
|
|||||||
" Wait for all the pending updates to terminal to complete
|
" Wait for all the pending updates to terminal to complete
|
||||||
call TermWait(a:buf)
|
call TermWait(a:buf)
|
||||||
|
|
||||||
|
" Wait for the terminal to end.
|
||||||
call WaitForAssert({-> assert_equal("finished", term_getstatus(a:buf))})
|
call WaitForAssert({-> assert_equal("finished", term_getstatus(a:buf))})
|
||||||
only!
|
|
||||||
|
" If the buffer still exists forcefully wipe it.
|
||||||
|
if bufexists(a:buf)
|
||||||
|
exe a:buf .. 'bwipe!'
|
||||||
|
endif
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
" Open a terminal with a shell, assign the job to g:job and return the buffer
|
" Open a terminal with a shell, assign the job to g:job and return the buffer
|
||||||
|
@@ -392,10 +392,14 @@ func Test_command_modifier_confirm()
|
|||||||
call term_sendkeys(buf, ":call Getout()\n")
|
call term_sendkeys(buf, ":call Getout()\n")
|
||||||
call WaitForAssert({-> assert_match('(Y)es, \[N\]o: ', term_getline(buf, 8))}, 1000)
|
call WaitForAssert({-> assert_match('(Y)es, \[N\]o: ', term_getline(buf, 8))}, 1000)
|
||||||
call term_sendkeys(buf, "y")
|
call term_sendkeys(buf, "y")
|
||||||
|
call WaitForAssert({-> assert_match('(Y)es, \[N\]o: ', term_getline(buf, 8))}, 1000)
|
||||||
|
call term_sendkeys(buf, "\<CR>")
|
||||||
|
call TermWait(buf)
|
||||||
call StopVimInTerminal(buf)
|
call StopVimInTerminal(buf)
|
||||||
|
|
||||||
call assert_equal(['changed'], readfile('Xfile'))
|
call assert_equal(['changed'], readfile('Xfile'))
|
||||||
call delete('Xfile')
|
call delete('Xfile')
|
||||||
|
call delete('.Xfile.swp') " in case Vim was killed
|
||||||
call delete('Xconfirmscript')
|
call delete('Xconfirmscript')
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1937,
|
||||||
/**/
|
/**/
|
||||||
1936,
|
1936,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user