# HG changeset patch # User Bram Moolenaar # Date 1616524203 -3600 # Node ID 5b841f349e77024211aef46cd3048d3e44182597 # Parent 49ce30bd248fc3ce1b65d378ba479f11b04f62f5 patch 8.2.2648: terminal resize test sometimes hangs Commit: https://github.com/vim/vim/commit/c54f347d63bcca97ead673d01ac6b59914bb04e5 Author: Bram Moolenaar Date: Tue Mar 23 19:22:12 2021 +0100 patch 8.2.2648: terminal resize test sometimes hangs Problem: Terminal resize test sometimes hangs. Solution: Wait for the shell to display a prompt and other output. diff --git a/src/testdir/test_terminal2.vim b/src/testdir/test_terminal2.vim --- a/src/testdir/test_terminal2.vim +++ b/src/testdir/test_terminal2.vim @@ -246,6 +246,10 @@ func Test_terminal_resize() 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,6 +257,9 @@ func Test_terminal_resize() 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,6 +270,7 @@ func Test_terminal_resize() close call assert_equal(2, winnr('$')) call feedkeys("exit\", 'xt') + call TermWait(buf) set statusline& endfunc diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2648, +/**/ 2647, /**/ 2646,