diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-02-29 16:09:16 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-02-29 16:09:16 +0100 |
| commit | 57c339569e96725e24e79944bf99f70c50afb5b1 (patch) | |
| tree | 529d35807a0f94a950af14a28de2697790644f1d | |
| parent | d30ae2fc4acb3861fc7dc9618c1f90eee997d412 (diff) | |
| download | vim-git-8.2.0333.tar.gz | |
patch 8.2.0333: terminal in popup test is flakyv8.2.0333
Problem: Terminal in popup test is flaky.
Solution: Make sure redraw is done before opening the popup.
| -rw-r--r-- | src/testdir/dumps/Test_terminal_popup_1.dump | 2 | ||||
| -rw-r--r-- | src/testdir/test_terminal.vim | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/testdir/dumps/Test_terminal_popup_1.dump b/src/testdir/dumps/Test_terminal_popup_1.dump index a03d58981..3e071498d 100644 --- a/src/testdir/dumps/Test_terminal_popup_1.dump +++ b/src/testdir/dumps/Test_terminal_popup_1.dump @@ -12,4 +12,4 @@ |1@1| @11|╚+0#0000001#ffd7ff255|═@44|⇲| +0#0000000#ffffff0@13 |1|2| @72 |1|3| @72 -|t|e|r|m|i|n|a|l| |p|o|p|u|p| @42|0|,|0|-|1| @8|A|l@1| +|t|e|r|m|i|n|a|l| |p|o|p|u|p| @42|1|,|1| @10|T|o|p| diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index e2d759546..1a9e1e3d4 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -2339,29 +2339,28 @@ func Test_terminal_in_popup() \ 'hi PopTerm ctermbg=grey', \ 'func OpenTerm(setColor)', \ " let s:buf = term_start('" .. cmd .. " Xtext', #{hidden: 1, term_finish: 'close'})", - \ ' let s:winid = popup_create(s:buf, #{minwidth: 45, minheight: 7, border: [], drag: 1, resize: 1})', + \ ' let g:winid = popup_create(s:buf, #{minwidth: 45, minheight: 7, border: [], drag: 1, resize: 1})', \ ' if a:setColor', - \ ' call win_execute(s:winid, "set wincolor=PopTerm")', + \ ' call win_execute(g:winid, "set wincolor=PopTerm")', \ ' endif', \ 'endfunc', - \ 'call OpenTerm(0)', \ 'func HidePopup()', - \ ' call popup_hide(s:winid)', + \ ' call popup_hide(g:winid)', \ 'endfunc', \ 'func ClosePopup()', - \ ' call popup_close(s:winid)', + \ ' call popup_close(g:winid)', \ 'endfunc', \ 'func ReopenPopup()', \ ' call popup_create(s:buf, #{minwidth: 40, minheight: 6, border: []})', \ 'endfunc', - \ 'sleep 10m', - \ 'redraw', - \ 'echo getwinvar(s:winid, "&buftype") win_gettype(s:winid)', \ ] call writefile(lines, 'XtermPopup') let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15}) call term_wait(buf, 100) + call term_sendkeys(buf, ":call OpenTerm(0)\<CR>") + call term_wait(buf, 100) call term_sendkeys(buf, ":\<CR>") + call term_sendkeys(buf, "\<C-W>:echo getwinvar(g:winid, \"&buftype\") win_gettype(g:winid)\<CR>") call VerifyScreenDump(buf, 'Test_terminal_popup_1', {}) call term_sendkeys(buf, ":q\<CR>") diff --git a/src/version.c b/src/version.c index 42b859aba..a8289633b 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 333, +/**/ 332, /**/ 331, |