diff options
| author | Yegappan Lakshmanan <yegappan@yahoo.com> | 2023-01-19 17:49:58 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-01-19 17:49:58 +0000 |
| commit | e446a017ffeaf1941589ac51ce9153b859018e5b (patch) | |
| tree | d708cce67946fd65744776bae0f1f583318158a1 | |
| parent | f97a295ccaa9803367f3714cdefce4e2283c771d (diff) | |
patch 9.0.1222: terminal tests are flaky on MacOSv9.0.1222
Problem: Terminal tests are flaky on MacOS.
Solution: Add TermWait() calls. (Yegappan Lakshmanan, closes #11852)
| -rw-r--r-- | src/testdir/test_terminal2.vim | 4 | ||||
| -rw-r--r-- | src/testdir/test_terminal3.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/testdir/test_terminal2.vim b/src/testdir/test_terminal2.vim index c6acb99bc3..8615bf55ad 100644 --- a/src/testdir/test_terminal2.vim +++ b/src/testdir/test_terminal2.vim @@ -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 @@ -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)) @@ -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))}) @@ -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)) }) diff --git a/src/testdir/test_terminal3.vim b/src/testdir/test_terminal3.vim index f23bfd2246..96a9e63c13 100644 --- a/src/testdir/test_terminal3.vim +++ b/src/testdir/test_terminal3.vim @@ -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))}) diff --git a/src/version.c b/src/version.c index d94f43f9e1..22a8e8b774 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1222, +/**/ 1221, /**/ 1220, |