To: vim_dev@googlegroups.com Subject: Patch 8.2.2648 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2648 Problem: Terminal resize test sometimes hangs. Solution: Wait for the shell to display a prompt and other output. Files: src/testdir/test_terminal2.vim *** ../vim-8.2.2647/src/testdir/test_terminal2.vim 2020-12-18 19:49:52.349571840 +0100 --- src/testdir/test_terminal2.vim 2021-03-23 19:18:50.134494219 +0100 *************** *** 246,251 **** --- 246,255 ---- set statusline=x terminal call assert_equal(2, winnr('$')) + let buf = bufnr() + + " Wait for the shell to display a prompt + call WaitForAssert({-> assert_notequal('', term_getline(buf, 1))}) " Fill the terminal with text. if has('win32') *************** *** 253,258 **** --- 257,265 ---- else call feedkeys("ls\", 'xt') endif + " Wait for some output + call WaitForAssert({-> assert_notequal('', term_getline(buf, 3))}) + " Go to Terminal-Normal mode for a moment. call feedkeys("\N", 'xt') " Open a new window *************** *** 263,268 **** --- 270,276 ---- close call assert_equal(2, winnr('$')) call feedkeys("exit\", 'xt') + call TermWait(buf) set statusline& endfunc *** ../vim-8.2.2647/src/version.c 2021-03-23 16:25:05.910822743 +0100 --- src/version.c 2021-03-23 19:21:31.662135681 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2648, /**/ -- hundred-and-one symptoms of being an internet addict: 25. You believe nothing looks sexier than a man in boxer shorts illuminated only by a 17" inch svga monitor. /// 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 ///