# HG changeset patch # User Bram Moolenaar # Date 1585337404 -3600 # Node ID d1d840cfd135d18f52fb7833ba130289825f1f2a # Parent 6fcd4e5daa05183e9a68e3f33eec4df0be5fa81f patch 8.2.0462: previewwindow test fails on some systems Commit: https://github.com/vim/vim/commit/37bb030cd9088ee66dc2d41c2d3602d1e5f4a7ef Author: Bram Moolenaar Date: Fri Mar 27 20:24:14 2020 +0100 patch 8.2.0462: previewwindow test fails on some systems Problem: Previewwindow test fails on some systems. (James McCoy) Solution: Wait a bit after sending the "o". (closes https://github.com/vim/vim/issues/5849) diff --git a/src/testdir/dumps/Test_popup_and_previewwindow_01.dump b/src/testdir/dumps/Test_popup_and_previewwindow_01.dump --- a/src/testdir/dumps/Test_popup_and_previewwindow_01.dump +++ b/src/testdir/dumps/Test_popup_and_previewwindow_01.dump @@ -16,5 +16,5 @@ |a+0#0000001#ffd7ff255|b|6| @11| +0#0000000#a8a8a8255| +0&#ffffff0@58 |a|b|0> @71 |~+0#4040ff13&| @73 -|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|1|0|,|1| @10|B|o|t +|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|1@1|,|1| @10|B|o|t |-+2&&@1| |K|e|y|w|o|r|d| |L|o|c|a|l| |c|o|m|p|l|e|t|i|o|n| |(|^|N|^|P|)| |m+0#00e0003&|a|t|c|h| |1| |o|f| |1|0| +0#0000000&@26 diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim --- a/src/testdir/test_popup.vim +++ b/src/testdir/test_popup.vim @@ -743,15 +743,19 @@ func Test_popup_and_previewwindow_dump() let lines =<< trim END set previewheight=9 silent! pedit - call setline(1, map(repeat(["ab"], 10), "v:val. v:key")) + call setline(1, map(repeat(["ab"], 10), "v:val .. v:key")) exec "norm! G\\" END call writefile(lines, 'Xscript') let buf = RunVimInTerminal('-S Xscript', {}) + " wait for the script to finish + call term_wait(buf) + " Test that popup and previewwindow do not overlap. - call term_sendkeys(buf, "o\\") - sleep 100m + call term_sendkeys(buf, "o") + call term_wait(buf, 100) + call term_sendkeys(buf, "\\") call VerifyScreenDump(buf, 'Test_popup_and_previewwindow_01', {}) call term_sendkeys(buf, "\u") diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 462, +/**/ 461, /**/ 460,