Skip to content

Commit

Permalink
patch 8.0.1721: no test for using the 'termsize' option
Browse files Browse the repository at this point in the history
Problem:    No test for using the 'termsize' option.
Solution:   Add a test.
  • Loading branch information
brammool committed Apr 15, 2018
1 parent 802bfb1 commit a7eef3d
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/testdir/screendump.vim
Expand Up @@ -57,7 +57,12 @@ func RunVimInTerminal(arguments, options)
" 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': cols})
call assert_equal([rows, cols], term_getsize(buf))
if &termsize == ''
call assert_equal([rows, cols], term_getsize(buf))
else
let rows = term_getsize(buf)[0]
let cols = term_getsize(buf)[1]
endif

" Wait for "All" of the ruler in the status line to be shown.
" This can be quite slow (e.g. when using valgrind).
Expand Down
33 changes: 33 additions & 0 deletions src/testdir/test_terminal.vim
Expand Up @@ -1356,3 +1356,36 @@ func Test_terminal_ansicolors_func()
call term_wait(buf)
exe buf . 'bwipe'
endfunc

func Test_terminal_termsize_option()
if !CanRunVimInTerminal()
return
endif
set termsize=6x40
let text = []
for n in range(10)
call add(text, repeat(n, 50))
endfor
call writefile(text, 'Xwinsize')
let buf = RunVimInTerminal('Xwinsize', {})
let win = bufwinid(buf)
call assert_equal([6, 40], term_getsize(buf))
call assert_equal(6, winheight(win))
call assert_equal(40, winwidth(win))

" resizing the window doesn't resize the terminal.
resize 10
vertical resize 60
call assert_equal([6, 40], term_getsize(buf))
call assert_equal(10, winheight(win))
call assert_equal(60, winwidth(win))

call StopVimInTerminal(buf)
call delete('Xwinsize')

call assert_fails('set termsize=40', 'E474')
call assert_fails('set termsize=10+40', 'E474')
call assert_fails('set termsize=abc', 'E474')

set termsize=
endfunc
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -762,6 +762,8 @@ static char *(features[]) =

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

0 comments on commit a7eef3d

Please sign in to comment.