summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-12-04 22:26:40 +0000
committerBram Moolenaar <Bram@vim.org>2022-12-04 22:26:40 +0000
commita0a6f3a22a934fa68b71d82c23e2f6bf6e5b18d0 (patch)
treed731167fb3c72ca6a362e7bba762e05edbc310fc
parent3d3e2aa82695082d01f8d42032229c6fbcc0f1a6 (diff)
downloadvim-git-a0a6f3a22a934fa68b71d82c23e2f6bf6e5b18d0.tar.gz
patch 9.0.1004: suspend test sometimes fails on MacOSv9.0.1004
Problem: Suspend test sometimes fails on MacOS. Solution: Wait a short while for terminal responses.
-rw-r--r--src/testdir/test_suspend.vim5
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/testdir/test_suspend.vim b/src/testdir/test_suspend.vim
index 327fe069d..1c6ebbc31 100644
--- a/src/testdir/test_suspend.vim
+++ b/src/testdir/test_suspend.vim
@@ -2,6 +2,7 @@
source check.vim
source term_util.vim
+source shared.vim
func CheckSuspended(buf, fileExists)
call WaitForAssert({-> assert_match('[$#] $', term_getline(a:buf, '.'))})
@@ -21,6 +22,8 @@ func Test_suspend()
CheckFeature terminal
CheckExecutable /bin/sh
+ call WaitForResponses()
+
let buf = term_start('/bin/sh')
" Wait for shell prompt.
call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))})
@@ -65,6 +68,8 @@ func Test_suspend_autocmd()
CheckFeature terminal
CheckExecutable /bin/sh
+ call WaitForResponses()
+
let buf = term_start('/bin/sh', #{term_rows: 6})
" Wait for shell prompt.
call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))})
diff --git a/src/version.c b/src/version.c
index 8f5fadfc8..1f21dbc56 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1004,
+/**/
1003,
/**/
1002,