patch 8.2.0382: some tests fail when run under valgrind

Problem:    Some tests fail when run under valgrind.
Solution:   Increase timeouts.

diff --git a/src/testdir/dumps/Test_terminal_popup_1.dump b/src/testdir/dumps/Test_terminal_popup_1.dump
index 3e071498df1fb38cef3b2c88caff83db0a54ada7..d4311ba5967f15e2119189290705c7aa5b07dd4d 100644 (file)
--- a/src/testdir/dumps/Test_terminal_popup_1.dump
+++ b/src/testdir/dumps/Test_terminal_popup_1.dump
@@ -12,4 +12,4 @@
 |1@1| @11|╚+0#0000001#ffd7ff255|═@44|⇲| +0#0000000#ffffff0@13
 |1|2| @72
 |1|3| @72
-|t|e|r|m|i|n|a|l| |p|o|p|u|p| @42|1|,|1| @10|T|o|p| 
+|t|e|r|m|i|n|a|l| |p|o|p|u|p| @60

diff --git a/src/testdir/dumps/Test_terminal_popup_2.dump b/src/testdir/dumps/Test_terminal_popup_2.dump
index 478d0b49a9fe8f8c4df00550cbb93d2e9c2ee8b7..5e53e713d4989e2a9988ad46c6189b7f6df958bb 100644 (file)
--- a/src/testdir/dumps/Test_terminal_popup_2.dump
+++ b/src/testdir/dumps/Test_terminal_popup_2.dump
@@ -12,4 +12,4 @@
 |1@1| @72
 |1|2| @72
 |1|3| @72
-|"|[|N|o| |N|a|m|e|]|"| |[|M|o|d|i|f|i|e|d|]| |2|0| |l|i|n|e|s| |-@1|5|%|-@1| @18|1|,|1| @10|T|o|p| 
+|"|[|N|o| |N|a|m|e|]|"| |[|M|o|d|i|f|i|e|d|]| |l|i|n|e| |1| |o|f| |2|0| |-@1|5|%|-@1| |c|o|l| |1| @26

diff --git a/src/testdir/dumps/Test_terminal_popup_3.dump b/src/testdir/dumps/Test_terminal_popup_3.dump
index 6a6e0eb390cbaac86c3f90e77f8d0e34dbc8283c..91770827db3cf0200343b038a08296e6fb8cf7ea 100644 (file)
--- a/src/testdir/dumps/Test_terminal_popup_3.dump
+++ b/src/testdir/dumps/Test_terminal_popup_3.dump
@@ -12,4 +12,4 @@
 |1@1| @11|╚+0&#a8a8a8255|═@44|⇲| +0&#ffffff0@13
 |1|2| @72
 |1|3| @72
-@57|0|,|0|-|1| @8|A|l@1| 
+@75

diff --git a/src/testdir/dumps/Test_terminal_popup_5.dump b/src/testdir/dumps/Test_terminal_popup_5.dump
index 7dbf1a616274ba9ecd1463e247a94e4ce2ccbd2c..42808b0c06ddea04546286c82a4806073917a124 100644 (file)
--- a/src/testdir/dumps/Test_terminal_popup_5.dump
+++ b/src/testdir/dumps/Test_terminal_popup_5.dump
@@ -12,4 +12,4 @@
 |1@1| @72
 |1|2| @72
 |1|3| @72
-|:|c|a|l@1| |C|l|o|s|e|P|o|p|u|p|(|)| @38|1|,|1| @10|T|o|p| 
+|:|c|a|l@1| |C|l|o|s|e|P|o|p|u|p|(|)| @56

diff --git a/src/testdir/dumps/Test_terminal_popup_6.dump b/src/testdir/dumps/Test_terminal_popup_6.dump
index ebc67708ac07d011665f77127b34b758bb5567e6..da5cf46938870b9f34e8d4d26f7b41c325a5c1f2 100644 (file)
--- a/src/testdir/dumps/Test_terminal_popup_6.dump
+++ b/src/testdir/dumps/Test_terminal_popup_6.dump
@@ -12,4 +12,4 @@
 |1@1| @11|╚+0#0000001#ffd7ff255|═@44|╝| +0#0000000#ffffff0@13
 |1|2| @72
 |1|3| @72
-@57|1|,|1| @10|A|l@1| 
+@75

diff --git a/src/testdir/dumps/Test_terminal_popup_7.dump b/src/testdir/dumps/Test_terminal_popup_7.dump
index 6d0d7b69acc82c34867b8cf51a55f8ceb487c940..e7e5aae50d0e05e20f98ab2563cb086fe2aadc3c 100644 (file)
--- a/src/testdir/dumps/Test_terminal_popup_7.dump
+++ b/src/testdir/dumps/Test_terminal_popup_7.dump
@@ -12,4 +12,4 @@
 |1@1| @11|╚+0#0000001#ffd7ff255|═@44|╝| +0#0000000#ffffff0@13
 |1|2| @72
 |1|3| @72
-|-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@34|6| @8|3|,|6| @10|A|l@1| 
+|-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@51|6| @9

diff --git a/src/testdir/dumps/Test_terminal_popup_8.dump b/src/testdir/dumps/Test_terminal_popup_8.dump
index f8f6d9edf557ed8faeb38555239d84d85fb877f3..da5cf46938870b9f34e8d4d26f7b41c325a5c1f2 100644 (file)
--- a/src/testdir/dumps/Test_terminal_popup_8.dump
+++ b/src/testdir/dumps/Test_terminal_popup_8.dump
@@ -12,4 +12,4 @@
 |1@1| @11|╚+0#0000001#ffd7ff255|═@44|╝| +0#0000000#ffffff0@13
 |1|2| @72
 |1|3| @72
-@57|1|,|1| @10|T|o|p| 
+@75

diff --git a/src/testdir/dumps/Test_terminal_popup_m1.dump b/src/testdir/dumps/Test_terminal_popup_m1.dump
index 05a78f21ff3c72f156ac3a6597a31fe692d3f996..75432945aea86ca915a88269dd93c24955576722 100644 (file)
--- a/src/testdir/dumps/Test_terminal_popup_m1.dump
+++ b/src/testdir/dumps/Test_terminal_popup_m1.dump
@@ -12,4 +12,4 @@
 |1@1| @72
 |1|2| @72
 |1|3| @72
-|:| @55|1|,|1| @10|T|o|p| 
+|:| @73

diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 8a1d5d835bcb1897d48f08a37572bd9238d2560e..7e3035ae42a6b1ca622727322a1843e5ea39974e 100644 (file)
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2283,7 +2283,7 @@ func Test_autocmd_CmdWinEnter()
   call term_sendkeys(buf, "q:")
   call term_wait(buf)
   call term_sendkeys(buf, ":echo b:dummy_var\<cr>")
-  call WaitForAssert({-> assert_match('^This is a dummy', term_getline(buf, 6))}, 1000)
+  call WaitForAssert({-> assert_match('^This is a dummy', term_getline(buf, 6))}, 2000)
   call term_sendkeys(buf, ":echo &buftype\<cr>")
   call WaitForAssert({-> assert_notmatch('^nofile', term_getline(buf, 6))}, 1000)
   call term_sendkeys(buf, ":echo winnr\<cr>")

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index e1f8a5e352e42f84ee5ec4a06c1cfd27fe083973..af767d2c4074b329215b12f779f7d42c8ab3fcde 100644 (file)
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1999,15 +1999,15 @@ func Test_issue_5150()
   endif
   let g:job = job_start(cmd, {})
   call job_stop(g:job)
-  sleep 10m
+  sleep 50m
   call assert_equal(-1, job_info(g:job).exitval)
   let g:job = job_start(cmd, {})
   call job_stop(g:job, 'term')
-  sleep 10m
+  sleep 50m
   call assert_equal(-1, job_info(g:job).exitval)
   let g:job = job_start(cmd, {})
   call job_stop(g:job, 'kill')
-  sleep 10m
+  sleep 50m
   call assert_equal(-1, job_info(g:job).exitval)
 endfunc
 

diff --git a/src/testdir/test_debugger.vim b/src/testdir/test_debugger.vim
index c5418025bdd251d1f4ce9bc0443622685ec770d4..8ba3998f3fb3290fa4808ba298f26cd96df4ab13 100644 (file)
--- a/src/testdir/test_debugger.vim
+++ b/src/testdir/test_debugger.vim
@@ -8,7 +8,7 @@ source check.vim
 " If the expected output argument is supplied, then check for it.
 func RunDbgCmd(buf, cmd, ...)
   call term_sendkeys(a:buf, a:cmd . "\r")
-  call term_wait(a:buf)
+  call term_wait(a:buf, 20)
 
   if a:0 != 0
     " Verify the expected output

diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim
index 77045f4d099298309bf27a10aa9abbf71ad700ed..3a83577394b151f7a0aa7b3e8c9972f1d4e282df 100644 (file)
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -429,7 +429,7 @@ func Test_pum_with_preview_win()
   let buf = RunVimInTerminal('-S Xpreviewscript', #{rows: 12})
   call term_wait(buf, 100)
   call term_sendkeys(buf, "Gi\<C-X>\<C-O>")
-  call term_wait(buf, 100)
+  call term_wait(buf, 200)
   call term_sendkeys(buf, "\<C-N>")
   call VerifyScreenDump(buf, 'Test_pum_with_preview_win', {})
 

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 88e433d7d4bb8a5dbd669fd669c37732e511c21e..d763f78a7d4e6a365e8c81b770b74e3a9a949135 100644 (file)
--- 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>")

diff --git a/src/version.c b/src/version.c
index e49c628a334663edfd3ce3a3a89fe796a4b2342c..b6b408da37ed6778f93047656193cab8ddba1953 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    382,
 /**/
     381,
 /**/