patch 8.1.0531: flaky tests often fail with a common error message
Problem: Flaky tests often fail with a common error message.
Solution: Add a pattern to match an error message indicating a flaky test.
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index fe17abb..9ba5d13 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -273,7 +273,7 @@
endif
" Names of flaky tests.
-let s:flaky = [
+let s:flaky_tests = [
\ 'Test_call()',
\ 'Test_channel_handler()',
\ 'Test_client_server()',
@@ -329,6 +329,9 @@
\ 'Test_zz1_terminal_in_gui()',
\ ]
+" Pattern indicating a common flaky test failure.
+let s:flaky_errors_re = 'StopVimInTerminal'
+
" Locate Test_ functions and execute them.
redir @q
silent function /^Test_
@@ -353,7 +356,9 @@
" Repeat a flaky test. Give up when:
" - it fails again with the same message
" - it fails five times (with a different mesage)
- if len(v:errors) > 0 && index(s:flaky, s:test) >= 0
+ if len(v:errors) > 0
+ \ && (index(s:flaky_tests, s:test) >= 0
+ \ || v:errors[0] =~ s:flaky_errors_re)
while 1
call add(s:messages, 'Found errors in ' . s:test . ':')
call extend(s:messages, v:errors)
diff --git a/src/version.c b/src/version.c
index 878891e..e18c025 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 531,
+/**/
530,
/**/
529,