aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.1.0508: suspend test fails when run by root

Browse Source 
Problem:    Suspend test fails when run by root.
Solution:   Accept both '$' and '#' for the prompt. (James McCoy, closes #3590)
This commit is contained in:
Bram Moolenaar
2018-11-03 21:09:15 +01:00
parent da1c11c641
commit 0f62cf5b33
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/testdir/test_suspend.vim
View File

@@ -9,7 +9,7 @@ func Test_suspend()
let buf = term_start('/bin/sh') let buf = term_start('/bin/sh')
" Wait for shell prompt. " Wait for shell prompt.
call WaitForAssert({-> assert_match('$ $', term_getline(buf, '.'))}) call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))})
call term_sendkeys(buf, v:progpath call term_sendkeys(buf, v:progpath
\ . " --clean -X" \ . " --clean -X"
@@ -26,7 +26,7 @@ func Test_suspend()
\ "\<C-Z>"] \ "\<C-Z>"]
" Suspend and wait for shell prompt. " Suspend and wait for shell prompt.
call term_sendkeys(buf, suspend_cmd) call term_sendkeys(buf, suspend_cmd)
call WaitForAssert({-> assert_match('$ $', term_getline(buf, '.'))}) call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))})
" Without 'autowrite', buffer should not be written. " Without 'autowrite', buffer should not be written.
call assert_equal(0, filereadable('Xfoo')) call assert_equal(0, filereadable('Xfoo'))
@@ -40,7 +40,7 @@ func Test_suspend()
call assert_equal(0, filereadable('Xfoo')) call assert_equal(0, filereadable('Xfoo'))
call term_sendkeys(buf, ":suspend\<CR>") call term_sendkeys(buf, ":suspend\<CR>")
" Wait for shell prompt. " Wait for shell prompt.
call WaitForAssert({-> assert_match('$ $', term_getline(buf, '.'))}) call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))})
call assert_equal(['foo'], readfile('Xfoo')) call assert_equal(['foo'], readfile('Xfoo'))
call term_sendkeys(buf, "fg\<CR>") call term_sendkeys(buf, "fg\<CR>")
call WaitForAssert({-> assert_equal(' 1 foo', term_getline(buf, '.'))}) call WaitForAssert({-> assert_equal(' 1 foo', term_getline(buf, '.'))})

2
src/version.c
View File

@@ -792,6 +792,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 */
/**/
508,
/**/ /**/
507, 507,
/**/ /**/