diff src/testdir/test_terminal.vim @ 19651:283c8bc6a8e2 v8.2.0382

patch 8.2.0382: some tests fail when run under valgrind Commit: https://github.com/vim/vim/commit/353c351bd22e4dac4c3ae9cd7731032348f248c4 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 15 14:19:26 2020 +0100 patch 8.2.0382: some tests fail when run under valgrind Problem: Some tests fail when run under valgrind. Solution: Increase timeouts.
author Bram Moolenaar <Bram@vim.org>
date Sun, 15 Mar 2020 14:30:05 +0100
parents c8cb1a41f64c
children a088571e1d9d
line wrap: on
line diff
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -2342,6 +2342,7 @@ func Test_terminal_in_popup()
 	\ 'call setline(1, range(20))',
 	\ 'hi PopTerm ctermbg=grey',
 	\ 'func OpenTerm(setColor)',
+	\ "  set noruler",
 	\ "  let s:buf = term_start('" .. cmd .. " Xtext', #{hidden: 1, term_finish: 'close'})",
 	\ '  let g:winid = popup_create(s:buf, #{minwidth: 45, minheight: 7, border: [], drag: 1, resize: 1})',
 	\ '  if a:setColor',
@@ -2360,11 +2361,11 @@ func Test_terminal_in_popup()
 	\ ]
   call writefile(lines, 'XtermPopup')
   let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15})
-  call term_wait(buf, 100)
-  call term_sendkeys(buf, "\<C-L>")
+  call term_wait(buf, 200)
   call term_sendkeys(buf, ":call OpenTerm(0)\<CR>")
-  call term_wait(buf, 100)
+  call term_wait(buf, 200)
   call term_sendkeys(buf, ":\<CR>")
+  call term_wait(buf, 200)
   call term_sendkeys(buf, "\<C-W>:echo getwinvar(g:winid, \"&buftype\") win_gettype(g:winid)\<CR>")
   call VerifyScreenDump(buf, 'Test_terminal_popup_1', {})
 
@@ -2372,6 +2373,7 @@ func Test_terminal_in_popup()
   call VerifyScreenDump(buf, 'Test_terminal_popup_2', {})
  
   call term_sendkeys(buf, ":call OpenTerm(1)\<CR>")
+  call term_wait(buf, 300)
   call term_sendkeys(buf, ":set hlsearch\<CR>")
   call term_sendkeys(buf, "/edit\<CR>")
   call VerifyScreenDump(buf, 'Test_terminal_popup_3', {})
@@ -2397,7 +2399,7 @@ func Test_terminal_in_popup()
 
   call term_wait(buf, 100)
   call term_sendkeys(buf, ":q\<CR>")
-  call term_wait(buf, 100)  " wait for terminal to vanish
+  call term_wait(buf, 200)  " wait for terminal to vanish
 
   call StopVimInTerminal(buf)
   call delete('Xtext')
@@ -2425,8 +2427,8 @@ func Test_terminal_in_popup_min_size()
 	\ ]
   call writefile(lines, 'XtermPopup')
   let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15})
-  call term_wait(buf, 100)
-  call term_sendkeys(buf, "\<C-L>")
+  call term_wait(buf, 200)
+  call term_sendkeys(buf, ":set noruler\<CR>")
   call term_sendkeys(buf, ":call OpenTerm()\<CR>")
   call term_wait(buf, 100)
   call term_sendkeys(buf, ":\<CR>")