diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-11-01 20:04:57 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-11-01 20:04:57 +0100 |
| commit | 645cd3eb1fae784579fab11feea634bfaff9af49 (patch) | |
| tree | 56b2d2cba7c0604c5bc0e0d8a923aebb2f3891b4 | |
| parent | 388908352f88e7391accb3545b082db0fc89d9f7 (diff) | |
patch 8.2.1937: Vim9: test for confirm modifier fails in some situationsv8.2.1937
Problem: Vim9: test for confirm modifier fails in some situations.
Solution: Add a short wait. Handle failure better.
| -rw-r--r-- | src/testdir/term_util.vim | 7 | ||||
| -rw-r--r-- | src/testdir/test_vim9_cmd.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/testdir/term_util.vim b/src/testdir/term_util.vim index 53735c8d33..c2a2c350cd 100644 --- a/src/testdir/term_util.vim +++ b/src/testdir/term_util.vim @@ -147,8 +147,13 @@ func StopVimInTerminal(buf) " Wait for all the pending updates to terminal to complete call TermWait(a:buf) + " Wait for the terminal to end. 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 " Open a terminal with a shell, assign the job to g:job and return the buffer diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim index a355af14fe..a87d9b25a8 100644 --- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -392,10 +392,14 @@ func Test_command_modifier_confirm() call term_sendkeys(buf, ":call Getout()\n") call WaitForAssert({-> assert_match('(Y)es, \[N\]o: ', term_getline(buf, 8))}, 1000) 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 assert_equal(['changed'], readfile('Xfile')) call delete('Xfile') + call delete('.Xfile.swp') " in case Vim was killed call delete('Xconfirmscript') endfunc diff --git a/src/version.c b/src/version.c index 82bb09de77..65050b9a31 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1937, +/**/ 1936, /**/ 1935, |