patch 9.0.1118: sporadic test failures when using a terminal window

Problem:    Sporadic test failures when using a terminal window.
Solution:   Adjust waiting times. (James McCoy, closes #11763)

diff --git a/src/testdir/term_util.vim b/src/testdir/term_util.vim
index 98c9cfb40b18fef36c9c4433268faa99d1ca0dac..0f03731845054531f3d34ee1b6b84f8ac49af00e 100644 (file)
--- a/src/testdir/term_util.vim
+++ b/src/testdir/term_util.vim
@@ -141,6 +141,9 @@ func StopVimInTerminal(buf, kill = 1)
 
   call assert_equal("running", term_getstatus(a:buf))
 
+  " Wait for all the pending updates to terminal to complete
+  call TermWait(a:buf)
+
   " CTRL-O : works both in Normal mode and Insert mode to start a command line.
   " In Command-line it's inserted, the CTRL-U removes it again.
   call term_sendkeys(a:buf, "\<C-O>:\<C-U>qa!\<cr>")

diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index c6abb1b6d9d494414532d44a4e7493b4eb36a833..cf3d6fca133ade0ede043e08b1a58ad8b85d859e 100644 (file)
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2393,7 +2393,6 @@ func Test_autocmd_user_clear_group()
   call term_sendkeys(buf, ":autocmd User\<CR>")
   call TermWait(buf, 50)
   call term_sendkeys(buf, "G")
-  call TermWait(buf, 50)
 
   call StopVimInTerminal(buf)
 endfunc

diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index e51803d0eec34ceda545edce734270167c43c887..074ab1546762baa9e1a2d1aa0b05737dfe28d40f 100644 (file)
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -375,7 +375,7 @@ func Test_searchpair_timeout_with_skip()
   else
     let ms = 1
     let min_time = 0.001
-    let max_time = min_time * 10.0
+    let max_time = min_time * 15.0
     if RunningWithValgrind()
       let max_time += 0.04  " this can be slow with valgrind
     endif

diff --git a/src/version.c b/src/version.c
index 9c64a27b110a9775ba6387a7c88ef7315de54336..a66b58893ab8baa4abfc75be224d8eafccf567f0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1118,
 /**/
     1117,
 /**/