1
0
forked from aniani/vim

patch 8.2.0432: a few tests fail in a huge terminal

Problem:    A few tests fail in a huge terminal.
Solution:   Make the tests pass. (Dominique Pelle, closes #5829)
This commit is contained in:
Bram Moolenaar
2020-03-23 19:28:44 +01:00
parent 56ba21a156
commit ab505b1a48
6 changed files with 23 additions and 19 deletions

View File

@@ -1967,12 +1967,12 @@ endfunc
func Test_autocmd_bufreadpre() func Test_autocmd_bufreadpre()
new new
let b:bufreadpre = 1 let b:bufreadpre = 1
call append(0, range(100)) call append(0, range(1000))
w! XAutocmdBufReadPre.txt w! XAutocmdBufReadPre.txt
autocmd BufReadPre <buffer> :let b:bufreadpre += 1 autocmd BufReadPre <buffer> :let b:bufreadpre += 1
norm! 50gg norm! 500gg
sp sp
norm! 100gg norm! 1000gg
wincmd p wincmd p
let g:wsv1 = winsaveview() let g:wsv1 = winsaveview()
wincmd p wincmd p

View File

@@ -396,8 +396,7 @@ endfunc
func Test_set_one_column() func Test_set_one_column()
let out_mult = execute('set all')->split("\n") let out_mult = execute('set all')->split("\n")
let out_one = execute('set! all')->split("\n") let out_one = execute('set! all')->split("\n")
" one column should be two to four times as many lines call assert_true(len(out_mult) < len(out_one))
call assert_inrange(len(out_mult) * 2, len(out_mult) * 4, len(out_one))
endfunc endfunc
func Test_set_values() func Test_set_values()

View File

@@ -758,16 +758,20 @@ func Test_term_mouse_click_in_cmdline_to_set_pos()
let row = &lines let row = &lines
for ttymouse_val in g:Ttymouse_values + g:Ttymouse_dec for ttymouse_val in g:Ttymouse_values + g:Ttymouse_dec
let msg = 'ttymouse=' .. ttymouse_val " When 'ttymouse' is 'xterm2', row/col bigger than 223 are not supported.
exe 'set ttymouse=' .. ttymouse_val if ttymouse_val !=# 'xterm2' || row <= 223
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
call feedkeys(':"3456789'
\ .. MouseLeftClickCode(row, 7) call feedkeys(':"3456789'
\ .. MouseLeftReleaseCode(row, 7) .. 'L' \ .. MouseLeftClickCode(row, 7)
\ .. MouseRightClickCode(row, 4) \ .. MouseLeftReleaseCode(row, 7) .. 'L'
\ .. MouseRightReleaseCode(row, 4) .. 'R' \ .. MouseRightClickCode(row, 4)
\ .. "\<CR>", 'Lx!') \ .. MouseRightReleaseCode(row, 4) .. 'R'
call assert_equal('"3R456L789', @:, msg) \ .. "\<CR>", 'Lx!')
call assert_equal('"3R456L789', @:, msg)
endif
endfor endfor
let &mouse = save_mouse let &mouse = save_mouse

View File

@@ -673,7 +673,7 @@ func Test_terminal_noblock()
let len = 5000 let len = 5000
endif endif
for c in ['a','b','c','d','e','f','g','h','i','j','k'] for c in split('abcdefghijklmnopqrstuvwxyz', '\zs')
call term_sendkeys(buf, 'echo ' . repeat(c, len) . "\<cr>") call term_sendkeys(buf, 'echo ' . repeat(c, len) . "\<cr>")
endfor endfor
call term_sendkeys(buf, "echo done\<cr>") call term_sendkeys(buf, "echo done\<cr>")
@@ -2495,7 +2495,7 @@ func Test_term_nasty_callback()
func TermExit(...) func TermExit(...)
call term_sendkeys(bufnr('#'), "exit\<CR>") call term_sendkeys(bufnr('#'), "exit\<CR>")
call popup_close(win_getid()) call popup_close(win_getid())
endfu endfunc
call OpenTerms() call OpenTerms()
call term_sendkeys(g:buf0, "exit\<CR>") call term_sendkeys(g:buf0, "exit\<CR>")
@@ -2503,4 +2503,3 @@ func Test_term_nasty_callback()
exe g:buf0 .. 'bwipe!' exe g:buf0 .. 'bwipe!'
set hidden& set hidden&
endfunc endfunc

View File

@@ -1013,13 +1013,13 @@ func Run_noroom_for_newwindow_test(dir_arg)
let dir = (a:dir_arg == 'v') ? 'vert ' : '' let dir = (a:dir_arg == 'v') ? 'vert ' : ''
" Open as many windows as possible " Open as many windows as possible
for i in range(500) while v:true
try try
exe dir . 'new' exe dir . 'new'
catch /E36:/ catch /E36:/
break break
endtry endtry
endfor endwhile
call writefile(['first', 'second', 'third'], 'Xfile1') call writefile(['first', 'second', 'third'], 'Xfile1')
call writefile([], 'Xfile2') call writefile([], 'Xfile2')

View File

@@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
432,
/**/ /**/
431, 431,
/**/ /**/