0
0
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00

patch 8.1.1173: suspend test has duplicated lines

Problem:    Suspend test has duplicated lines.
Solution:   Use a function.
This commit is contained in:
Bram Moolenaar
2019-04-14 14:31:11 +02:00
parent 74e3d4ec11
commit a8356bc173
2 changed files with 18 additions and 11 deletions

View File

@@ -2,6 +2,20 @@
source shared.vim
func CheckSuspended(buf, fileExists)
call WaitForAssert({-> assert_match('[$#] $', term_getline(a:buf, '.'))})
if a:fileExists
call assert_equal(['foo'], readfile('Xfoo'))
else
" Without 'autowrite', buffer should not be written.
call assert_equal(0, filereadable('Xfoo'))
endif
call term_sendkeys(a:buf, "fg\<CR>\<C-L>")
call WaitForAssert({-> assert_equal(' 1 foo', term_getline(a:buf, '.'))})
endfunc
func Test_suspend()
if !has('terminal') || !executable('/bin/sh')
return
@@ -26,13 +40,7 @@ func Test_suspend()
\ "\<C-Z>"]
" Suspend and wait for shell prompt.
call term_sendkeys(buf, suspend_cmd)
call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))})
" Without 'autowrite', buffer should not be written.
call assert_equal(0, filereadable('Xfoo'))
call term_sendkeys(buf, "fg\<CR>")
call WaitForAssert({-> assert_equal(' 1 foo', term_getline(buf, '.'))})
call CheckSuspended(buf, 0)
endfor
" Test that :suspend! with 'autowrite' writes content of buffers if modified.
@@ -40,10 +48,7 @@ func Test_suspend()
call assert_equal(0, filereadable('Xfoo'))
call term_sendkeys(buf, ":suspend\<CR>")
" Wait for shell prompt.
call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))})
call assert_equal(['foo'], readfile('Xfoo'))
call term_sendkeys(buf, "fg\<CR>")
call WaitForAssert({-> assert_equal(' 1 foo', term_getline(buf, '.'))})
call CheckSuspended(buf, 1)
" Quit gracefully to dump coverage information.
call term_sendkeys(buf, ":qall!\<CR>")

View File

@@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1173,
/**/
1172,
/**/