Skip to content

Commit

Permalink
patch 9.0.1222: terminal tests are flaky on MacOS
Browse files Browse the repository at this point in the history
Problem:    Terminal tests are flaky on MacOS.
Solution:   Add TermWait() calls. (Yegappan Lakshmanan, closes #11852)
  • Loading branch information
yegappan authored and brammool committed Jan 19, 2023
1 parent f97a295 commit e446a01
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/testdir/test_terminal2.vim
Expand Up @@ -129,6 +129,7 @@ func Test_terminal_hidden_winsize()
let cmd = GetDummyCmd()
let rows = winheight(0)
let buf = term_start(cmd, #{hidden: 1, term_rows: 10})
call TermWait(buf)
call assert_equal(rows, winheight(0))
call assert_equal([10, &columns], term_getsize(buf))
exe "bwipe! " .. buf
Expand Down Expand Up @@ -196,6 +197,7 @@ func Test_terminal_out_err()

let outfile = 'Xtermstdout'
let buf = term_start(['./Xechoerrout.sh'], {'out_io': 'file', 'out_name': outfile})
call TermWait(buf)

call WaitFor({-> !empty(readfile(outfile)) && !empty(term_getline(buf, 1))})
call assert_equal(['this is standard out'], readfile(outfile))
Expand All @@ -216,6 +218,7 @@ func Test_termwinscroll()
" will be dropped.
exe 'set termwinscroll=' . &lines
let buf = term_start('/bin/sh')
call TermWait(buf)
for i in range(1, &lines)
call feedkeys("echo " . i . "\<CR>", 'xt')
call WaitForAssert({-> assert_match(string(i), term_getline(buf, term_getcursor(buf)[0] - 1))})
Expand Down Expand Up @@ -508,6 +511,7 @@ func Test_term_gettitle()
endif

let term = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile', '-c', 'set title'])
call TermWait(term)
" When Vim is running as a server then the title ends in VIM{number}, thus
" optionally match a number after "VIM".
call WaitForAssert({-> assert_match('^\[No Name\] - VIM\d*$', term_gettitle(term)) })
Expand Down
1 change: 1 addition & 0 deletions src/testdir/test_terminal3.vim
Expand Up @@ -18,6 +18,7 @@ func Test_terminal_altscreen()
let cmd = "cat Xtext\<CR>"

let buf = term_start(&shell, {})
call TermWait(buf)
call writefile(["\<Esc>[?1047h"], 'Xtext', 'D')
call term_sendkeys(buf, cmd)
call WaitForAssert({-> assert_equal(1, term_getaltscreen(buf))})
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -695,6 +695,8 @@ static char *(features[]) =

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

0 comments on commit e446a01

Please sign in to comment.