From dbe6ef1036fd50fc837b76d4e1d862a9bbbcf09b Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 31 Dec 2022 11:44:57 +0000 Subject: [PATCH] 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) --- src/testdir/term_util.vim | 3 +++ src/testdir/test_autocmd.vim | 1 - src/testdir/test_search.vim | 2 +- src/version.c | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/testdir/term_util.vim b/src/testdir/term_util.vim index 98c9cfb40..0f0373184 100644 --- 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, "\:\qa!\") diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index c6abb1b6d..cf3d6fca1 100644 --- 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\") 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 e51803d0e..074ab1546 100644 --- 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 9c64a27b1..a66b58893 100644 --- 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, /**/ -- 2.40.0