Mercurial > vim
changeset 19776:42e4083429a7
patch 8.2.0444: swap file test fails on some systems
Commit: https://github.com/vim/vim/commit/d36ef573b2fad620824495f5423cb649cde55e03
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Mar 24 21:44:51 2020 +0100
patch 8.2.0444: swap file test fails on some systems
Problem: Swap file test fails on some systems.
Solution: Preserve the swap file. Send NL terminated keys.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 24 Mar 2020 21:45:05 +0100 |
| parents | 56dca79644a9 |
| children | b245e974d42c |
| files | src/testdir/test_swap.vim src/version.c |
| diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_swap.vim +++ b/src/testdir/test_swap.vim @@ -1,5 +1,6 @@ " Tests for the swap feature +source check.vim source shared.vim source term_util.vim @@ -352,11 +353,12 @@ endfunc " Test for selecting 'q' in the attention prompt func Test_swap_prompt_splitwin() - if !CanRunVimInTerminal() - throw 'Skipped: cannot run vim in terminal' - endif + CheckRunVimInTerminal + call writefile(['foo bar'], 'Xfile1') edit Xfile1 + preserve " should help to make sure the swap file exists + let buf = RunVimInTerminal('', {'rows': 20}) call term_sendkeys(buf, ":set nomore\n") call term_sendkeys(buf, ":set noruler\n") @@ -365,9 +367,9 @@ func Test_swap_prompt_splitwin() call WaitForAssert({-> assert_match('^\[O\]pen Read-Only, (E)dit anyway, (R)ecover, (Q)uit, (A)bort: $', term_getline(buf, 20))}) call term_sendkeys(buf, "q") call term_wait(buf) - call term_sendkeys(buf, ":") + call term_sendkeys(buf, ":\<CR>") call WaitForAssert({-> assert_match('^:$', term_getline(buf, 20))}) - call term_sendkeys(buf, "echomsg winnr('$')\<CR>") + call term_sendkeys(buf, ":echomsg winnr('$')\<CR>") call term_wait(buf) call WaitForAssert({-> assert_match('^1$', term_getline(buf, 20))}) call StopVimInTerminal(buf)