Skip to content

Commit

Permalink
patch 8.0.1644: terminal API tests still fail
Browse files Browse the repository at this point in the history
Problem:    Terminal API tests still fail.
Solution:   Explicitly set 'title' in the terminal job. (Ozaki Kiichi,
            closes #2750)
  • Loading branch information
brammool committed Mar 25, 2018
1 parent 2de50f8 commit cf67a50
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 14 deletions.
16 changes: 8 additions & 8 deletions src/testdir/screendump.vim
Expand Up @@ -24,7 +24,9 @@ source shared.vim
" By default uses a size of 20 lines and 75 columns.
" Returns the buffer number of the terminal.
"
" Options is a dictionary (not used yet).
" Options is a dictionary, these items are recognized:
" "rows" - height of the terminal window (max. 20)
" "cols" - width of the terminal window (max. 78)
func RunVimInTerminal(arguments, options)
" If Vim doesn't exit a swap file remains, causing other tests to fail.
" Remove it here.
Expand All @@ -47,17 +49,15 @@ func RunVimInTerminal(arguments, options)
set t_Co=256 background=light
hi Normal ctermfg=NONE ctermbg=NONE

" Make the window 20 lines high, unless told otherwise.
let rows = 20
if has_key(a:options, 'rows')
let rows = a:options['rows']
endif
" Make the window 20 lines high and 75 columns, unless told otherwise.
let rows = get(a:options, 'rows', 20)
let cols = get(a:options, 'cols', 75)

let cmd = GetVimCommandClean()
" Add -v to have gvim run in the terminal (if possible)
let cmd .= ' -v ' . a:arguments
let buf = term_start(cmd, {'curwin': 1, 'term_rows': rows, 'term_cols': 75})
call assert_equal([rows, 75], term_getsize(buf))
let buf = term_start(cmd, {'curwin': 1, 'term_rows': rows, 'term_cols': cols})
call assert_equal([rows, cols], term_getsize(buf))

return buf
endfunc
Expand Down
9 changes: 3 additions & 6 deletions src/testdir/test_terminal.vim
Expand Up @@ -1029,10 +1029,10 @@ func Test_terminal_api_drop_newwin()
return
endif
call assert_equal(1, winnr('$'))
set title

" Use the title termcap entries to output the escape sequence.
call writefile([
\ 'set title',
\ 'exe "set t_ts=\<Esc>]51; t_fs=\x07"',
\ 'let &titlestring = ''["drop","Xtextfile"]''',
\ 'redraw',
Expand All @@ -1046,7 +1046,6 @@ func Test_terminal_api_drop_newwin()
call StopVimInTerminal(buf)
call delete('Xscript')
bwipe Xtextfile
set title&
endfunc

func Test_terminal_api_drop_oldwin()
Expand All @@ -1058,10 +1057,10 @@ func Test_terminal_api_drop_oldwin()
let textfile_winid = win_getid()
call assert_equal(2, winnr('$'))
call win_gotoid(firstwinid)
set title

" Use the title termcap entries to output the escape sequence.
call writefile([
\ 'set title',
\ 'exe "set t_ts=\<Esc>]51; t_fs=\x07"',
\ 'let &titlestring = ''["drop","Xtextfile"]''',
\ 'redraw',
Expand All @@ -1074,7 +1073,6 @@ func Test_terminal_api_drop_oldwin()
call StopVimInTerminal(buf)
call delete('Xscript')
bwipe Xtextfile
set title&
endfunc

func TryThis(bufnum, arg)
Expand All @@ -1086,10 +1084,10 @@ func Test_terminal_api_call()
if !CanRunVimInTerminal()
return
endif
set title

" Use the title termcap entries to output the escape sequence.
call writefile([
\ 'set title',
\ 'exe "set t_ts=\<Esc>]51; t_fs=\x07"',
\ 'let &titlestring = ''["call","TryThis",["hello",123]]''',
\ 'redraw',
Expand All @@ -1104,5 +1102,4 @@ func Test_terminal_api_call()
call delete('Xscript')
unlet g:called_bufnum
unlet g:called_arg
set title&
endfunc
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -766,6 +766,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1644,
/**/
1643,
/**/
Expand Down

0 comments on commit cf67a50

Please sign in to comment.