To: vim_dev@googlegroups.com Subject: Patch 8.2.0462 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0462 Problem: Previewwindow test fails on some systems. (James McCoy) Solution: Wait a bit after sending the "o". (closes #5849) Files: src/testdir/test_popup.vim, src/testdir/dumps/Test_popup_and_previewwindow_01.dump *** ../vim-8.2.0461/src/testdir/test_popup.vim 2020-03-15 16:12:16.552208654 +0100 --- src/testdir/test_popup.vim 2020-03-27 20:23:15.056540606 +0100 *************** *** 743,757 **** let lines =<< trim END set previewheight=9 silent! pedit ! call setline(1, map(repeat(["ab"], 10), "v:val. v:key")) exec "norm! G\\" END call writefile(lines, 'Xscript') let buf = RunVimInTerminal('-S Xscript', {}) " Test that popup and previewwindow do not overlap. ! call term_sendkeys(buf, "o\\") ! sleep 100m call VerifyScreenDump(buf, 'Test_popup_and_previewwindow_01', {}) call term_sendkeys(buf, "\u") --- 743,761 ---- let lines =<< trim END set previewheight=9 silent! pedit ! 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") ! call term_wait(buf, 100) ! call term_sendkeys(buf, "\\") call VerifyScreenDump(buf, 'Test_popup_and_previewwindow_01', {}) call term_sendkeys(buf, "\u") *** ../vim-8.2.0461/src/testdir/dumps/Test_popup_and_previewwindow_01.dump 2018-12-01 11:47:11.000000000 +0100 --- src/testdir/dumps/Test_popup_and_previewwindow_01.dump 2020-03-27 20:13:15.530558554 +0100 *************** *** 16,20 **** |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 |-+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 --- 16,20 ---- |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@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 *** ../vim-8.2.0461/src/version.c 2020-03-27 19:40:59.116735170 +0100 --- src/version.c 2020-03-27 20:16:49.585842499 +0100 *************** *** 740,741 **** --- 740,743 ---- { /* Add new patch number below this line */ + /**/ + 462, /**/ -- MARTHA'S WAY: Don't throw out all that leftover wine. Freeze into ice cubes for future use in casseroles and sauces. MY WAY: What leftover wine? /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///