commit 0f62cf5b335968f7448af1a6f46e0104b7bc365e
author Bram Moolenaar <Bram@vim.org> Sat Nov 03 21:09:15 2018 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Nov 03 21:09:15 2018 +0100
tree 1c3b53f6c991f1839823458787b76339b7f27cdb
parent da1c11c6411182e9a4bd4374e3fb8851fef77113

patch 8.1.0508: suspend test fails when run by root

Problem:    Suspend test fails when run by root.
Solution:   Accept both '$' and '#' for the prompt. (James McCoy, closes #3590)

src/testdir/test_suspend.vim

diff --git a/src/testdir/test_suspend.vim b/src/testdir/test_suspend.vim
index 462173e..a9964b0 100644
--- a/src/testdir/test_suspend.vim
+++ b/src/testdir/test_suspend.vim
@@ -9,7 +9,7 @@
 
   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 @@
         \             "\<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 @@
   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, '.'))})

src/version.c

diff --git a/src/version.c b/src/version.c
index 28f39d4..1e66b3e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    508,
+/**/
     507,
 /**/
     506,