To: vim_dev@googlegroups.com Subject: Patch 8.2.2154 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2154 Problem: Popupwin test for terminal buffer fails sometimes. Solution: Wait for the prompt to appear. Files: src/testdir/test_popupwin.vim *** ../vim-8.2.2153/src/testdir/test_popupwin.vim 2020-12-17 21:56:06.295809259 +0100 --- src/testdir/test_popupwin.vim 2020-12-17 22:25:40.753351371 +0100 *************** *** 2673,2685 **** let termbuf = term_start(&shell, #{hidden: 1}) let winid = popup_create(termbuf, #{minwidth: 40, minheight: 10, border: []}) ! " Wait for shell to start and show a prompt call WaitForAssert({-> assert_equal("run", job_status(term_getjob(termbuf)))}) ! sleep 20m " When typing a character, the cursor is after it. call feedkeys("x", 'xt') ! sleep 10m redraw call WaitForAssert({ -> assert_equal('x', screenstring(screenrow(), screencol() - 1))}) call feedkeys("\", 'xt') --- 2673,2686 ---- let termbuf = term_start(&shell, #{hidden: 1}) let winid = popup_create(termbuf, #{minwidth: 40, minheight: 10, border: []}) ! " Wait for shell to start call WaitForAssert({-> assert_equal("run", job_status(term_getjob(termbuf)))}) ! " Wait for a prompt (see border char first, then space after prompt) ! call WaitForAssert({ -> assert_equal(' ', screenstring(screenrow(), screencol() - 1))}) " When typing a character, the cursor is after it. call feedkeys("x", 'xt') ! call term_wait(termbuf) redraw call WaitForAssert({ -> assert_equal('x', screenstring(screenrow(), screencol() - 1))}) call feedkeys("\", 'xt') *** ../vim-8.2.2153/src/version.c 2020-12-17 21:56:06.295809259 +0100 --- src/version.c 2020-12-17 22:27:21.925101822 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2154, /**/ -- "The future's already arrived - it's just not evenly distributed yet." -- William Gibson /// 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 ///