changeset 19324:276e24e916d5 v8.2.0220

patch 8.2.0220: terminal test did pass on Mac Commit: https://github.com/vim/vim/commit/1af5ce01c333ed8be57f15dd7ba7846ac4760810 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Feb 6 11:54:35 2020 +0100 patch 8.2.0220: terminal test did pass on Mac Problem: Terminal test did pass on Mac. Solution: Remove the skip again.
author Bram Moolenaar <Bram@vim.org>
date Thu, 06 Feb 2020 12:00:04 +0100
parents af8116c90200
children bf0e50bb2c82
files src/testdir/test_terminal.vim src/version.c
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -2359,12 +2359,10 @@ func Test_terminal_in_popup()
   call term_sendkeys(buf, "/edit\<CR>")
   call VerifyScreenDump(buf, 'Test_terminal_popup_3', {})
  
-  " TODO: somehow this causes the job to keep running on Mac
-  if !has('mac')
-    call term_sendkeys(buf, "\<C-W>:call HidePopup()\<CR>")
-    call VerifyScreenDump(buf, 'Test_terminal_popup_4', {})
-    call term_sendkeys(buf, "\<CR>")
-  endif
+  call term_sendkeys(buf, "\<C-W>:call HidePopup()\<CR>")
+  call VerifyScreenDump(buf, 'Test_terminal_popup_4', {})
+  call term_sendkeys(buf, "\<CR>")
+  call term_wait(buf, 50)
 
   call term_sendkeys(buf, ":q\<CR>")
   call term_wait(buf, 100)  " wait for terminal to vanish
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    220,
+/**/
     219,
 /**/
     218,