diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2018-11-04 05:58:22 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-11-04 11:58:22 +0100 |
| commit | 47473b39cb2b88c660e5a9959836440d5cd25d76 (patch) | |
| tree | b2962ab5be7c722795d755ae26fffb318f921b52 | |
| parent | 21fb9b2b085eca6d29d7d6b338ee11701b927df3 (diff) | |
| download | rneovim-47473b39cb2b88c660e5a9959836440d5cd25d76.tar.gz rneovim-47473b39cb2b88c660e5a9959836440d5cd25d76.tar.bz2 rneovim-47473b39cb2b88c660e5a9959836440d5cd25d76.zip | |
vim-patch:8.1.0508: suspend test fails when run by root (#9196)
Problem: Suspend test fails when run by root.
Solution: Accept both '$' and '#' for the prompt. (James McCoy, closes vim/vim#3590)
https://github.com/vim/vim/commit/0f62cf5b335968f7448af1a6f46e0104b7bc365e
| -rw-r--r-- | src/nvim/testdir/test_suspend.vim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/testdir/test_suspend.vim b/src/nvim/testdir/test_suspend.vim index 462173e8cc..a9964b0400 100644 --- a/src/nvim/testdir/test_suspend.vim +++ b/src/nvim/testdir/test_suspend.vim @@ -9,7 +9,7 @@ func Test_suspend() let buf = term_start('/bin/sh') " Wait for shell prompt. - call WaitForAssert({-> assert_match('$ $', term_getline(buf, '.'))}) + call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))}) call term_sendkeys(buf, v:progpath \ . " --clean -X" @@ -26,7 +26,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, '.'))}) + call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))}) " Without 'autowrite', buffer should not be written. call assert_equal(0, filereadable('Xfoo')) @@ -40,7 +40,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 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, '.'))}) |