To: vim_dev@googlegroups.com Subject: Patch 8.2.0752 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0752 Problem: Terminal in popup window test is a bit flaky. Solution: Wait for shell job status to be "run". Mark as flaky test. Files: src/testdir/test_popupwin.vim *** ../vim-8.2.0751/src/testdir/test_popupwin.vim 2020-05-13 16:34:10.401723784 +0200 --- src/testdir/test_popupwin.vim 2020-05-13 23:12:50.224305144 +0200 *************** *** 2422,2433 **** func Test_popupwin_terminal_buffer() CheckFeature terminal CheckUnix let origwin = win_getid() let ptybuf = term_start(&shell, #{hidden: 1}) let winid = popup_create(ptybuf, #{minwidth: 40, minheight: 10}) " Wait for shell to start ! sleep 200m " Check this doesn't crash call assert_equal(winnr(), winnr('j')) call assert_equal(winnr(), winnr('k')) --- 2422,2436 ---- func Test_popupwin_terminal_buffer() CheckFeature terminal CheckUnix + " Starting a terminal to run a shell in is considered flaky. + let g:test_is_flaky = 1 let origwin = win_getid() let ptybuf = term_start(&shell, #{hidden: 1}) let winid = popup_create(ptybuf, #{minwidth: 40, minheight: 10}) " Wait for shell to start ! call WaitForAssert({-> assert_equal("run", job_status(term_getjob(ptybuf)))}) ! sleep 100m " Check this doesn't crash call assert_equal(winnr(), winnr('j')) call assert_equal(winnr(), winnr('k')) *** ../vim-8.2.0751/src/version.c 2020-05-13 23:21:23.522438317 +0200 --- src/version.c 2020-05-13 23:16:22.831516868 +0200 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 752, /**/ -- From "know your smileys": :.-( Crying /// 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 ///