diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-04-14 14:31:11 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-04-14 14:31:11 +0200 |
| commit | a8356bc1734195d130c6eeaf4858356ae3a3f722 (patch) | |
| tree | c622d0389172b66d295bd27327bb8f12cab1a3a3 | |
| parent | 74e3d4ec113d4061d24768b5a08f55b918132215 (diff) | |
patch 8.1.1173: suspend test has duplicated linesv8.1.1173
Problem: Suspend test has duplicated lines.
Solution: Use a function.
| -rw-r--r-- | src/testdir/test_suspend.vim | 27 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 18 insertions, 11 deletions
diff --git a/src/testdir/test_suspend.vim b/src/testdir/test_suspend.vim index e569e49055..efda68de9b 100644 --- a/src/testdir/test_suspend.vim +++ b/src/testdir/test_suspend.vim @@ -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>") diff --git a/src/version.c b/src/version.c index aacbf13353..bc12aae17c 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1173, +/**/ 1172, /**/ 1171, |