patch 8.0.1082: tests fail when run under valgrind
Problem: Tests fail when run under valgrind.
Solution: Increase waiting times.
diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim
index 0f40371..811af13 100644
--- a/src/testdir/test_clientserver.vim
+++ b/src/testdir/test_clientserver.vim
@@ -35,7 +35,8 @@
endif
" Takes a short while for the server to be active.
- call WaitFor('serverlist() =~ "' . name . '"')
+ " When using valgrind it takes much longer.
+ call WaitFor('serverlist() =~ "' . name . '"', 5000)
call assert_match(name, serverlist())
call remote_foreground(name)
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index efc491d..004c2c3 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -104,6 +104,15 @@
let g:buf = 0
endfunc
+func Get_cat_123_cmd()
+ if has('win32')
+ return 'cmd /c "cls && color 2 && echo 123"'
+ else
+ call writefile(["\<Esc>[32m123"], 'Xtext')
+ return "cat Xtext"
+ endif
+endfunc
+
func Test_terminal_nasty_cb()
let cmd = Get_cat_123_cmd()
let g:buf = term_start(cmd, {'exit_cb': function('s:Nasty_exit_cb')})
@@ -143,15 +152,6 @@
call assert_equal('123', l)
endfunc
-func Get_cat_123_cmd()
- if has('win32')
- return 'cmd /c "cls && color 2 && echo 123"'
- else
- call writefile(["\<Esc>[32m123"], 'Xtext')
- return "cat Xtext"
- endif
-endfunc
-
func Test_terminal_scrape_123()
let cmd = Get_cat_123_cmd()
let buf = term_start(cmd)
@@ -393,7 +393,6 @@
call assert_equal(2, winnr('$'))
call assert_equal(4, winheight(0))
bwipe
-
endfunc
func Test_terminal_cwd()
@@ -613,6 +612,7 @@
call term_wait(buf)
call WaitFor('len(readfile("Xfile")) > 0')
call assert_match('executing job failed', readfile('Xfile')[0])
+ call WaitFor('!&modified')
call delete('Xfile')
bwipe
diff --git a/src/version.c b/src/version.c
index 0018bce..f2fde00 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1082,
+/**/
1081,
/**/
1080,