patch 8.2.1187: terminal2 test sometimes hangs in the GUI on Travis
Problem: Terminal2 test sometimes hangs in the GUI on Travis.
Solution: Disable Test_zz2_terminal_guioptions_bang() for now.
diff --git a/src/testdir/test_terminal2.vim b/src/testdir/test_terminal2.vim
index c1b38d2..b0eb3fa 100644
--- a/src/testdir/test_terminal2.vim
+++ b/src/testdir/test_terminal2.vim
@@ -256,35 +256,36 @@
unlet g:job
endfunc
-func Test_zz2_terminal_guioptions_bang()
- CheckGui
- set guioptions+=!
-
- let filename = 'Xtestscript'
- if has('win32')
- let filename .= '.bat'
- let prefix = ''
- let contents = ['@echo off', 'exit %1']
- else
- let filename .= '.sh'
- let prefix = './'
- let contents = ['#!/bin/sh', 'exit $1']
- endif
- call writefile(contents, filename)
- call setfperm(filename, 'rwxrwx---')
-
- " Check if v:shell_error is equal to the exit status.
- let exitval = 0
- execute printf(':!%s%s %d', prefix, filename, exitval)
- call assert_equal(exitval, v:shell_error)
-
- let exitval = 9
- execute printf(':!%s%s %d', prefix, filename, exitval)
- call assert_equal(exitval, v:shell_error)
-
- set guioptions&
- call delete(filename)
-endfunc
+" TODO: reenable when this no longer hangs on Travis
+"func Test_zz2_terminal_guioptions_bang()
+" CheckGui
+" set guioptions+=!
+"
+" let filename = 'Xtestscript'
+" if has('win32')
+" let filename .= '.bat'
+" let prefix = ''
+" let contents = ['@echo off', 'exit %1']
+" else
+" let filename .= '.sh'
+" let prefix = './'
+" let contents = ['#!/bin/sh', 'exit $1']
+" endif
+" call writefile(contents, filename)
+" call setfperm(filename, 'rwxrwx---')
+"
+" " Check if v:shell_error is equal to the exit status.
+" let exitval = 0
+" execute printf(':!%s%s %d', prefix, filename, exitval)
+" call assert_equal(exitval, v:shell_error)
+"
+" let exitval = 9
+" execute printf(':!%s%s %d', prefix, filename, exitval)
+" call assert_equal(exitval, v:shell_error)
+"
+" set guioptions&
+" call delete(filename)
+"endfunc
func Test_terminal_hidden()
CheckUnix
@@ -305,6 +306,11 @@
term
let bnr = bufnr('$')
call WaitForAssert({-> assert_equal('running', term_getstatus(bnr))})
+ " In the GUI the first switch sometimes doesn't work. Switch twice to avoid
+ " flakyness.
+ call feedkeys("\<C-W>N", 'xt')
+ call feedkeys("A", 'xt')
+ call WaitForAssert({-> assert_equal('running', term_getstatus(bnr))})
call feedkeys("\<C-W>N", 'xt')
call WaitForAssert({-> assert_equal('running,normal', term_getstatus(bnr))})
call feedkeys("A", 'xt')
diff --git a/src/version.c b/src/version.c
index d36c7b3..d0067bf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1187,
+/**/
1186,
/**/
1185,