patch 8.2.3806: terminal focus test fails sometimes

Problem: Terminal focus test fails sometimes. Solution: Run the test function before others.
vim · Dec 14, 2021 · c295858 · c295858
1 parent 8176be1
commit c295858
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
@@ -1124,7 +1124,8 @@ func Test_terminal_response_to_control_sequence()
   unlet g:job
 endfunc
 
-func Test_terminal_focus_events()
+" Run this first, it fails when run after other tests.
+func Test_aa_terminal_focus_events()
   CheckNotGui
   CheckUnix
   CheckRunVimInTerminal
@@ -1137,8 +1138,6 @@ func Test_terminal_focus_events()
       set term=xterm ttymouse=xterm2
       au FocusLost * call setline(1, 'I am lost') | set nomod
       au FocusGained * call setline(1, 'I am back') | set nomod
-      " FIXME: sometimes this job hangs, exit after a couple of seconds
-      call timer_start(2000, {id -> execute('qall')})
   END
   call writefile(lines, 'XtermFocus')
   let buf = RunVimInTerminal('-S XtermFocus', #{rows: 6})

diff --git a/src/version.c b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3806,
 /**/
     3805,
 /**/