From: Bram Moolenaar Date: Wed, 25 Mar 2020 20:27:22 +0000 (+0100) Subject: patch 8.2.0447: terminal scroll tests fails on some systems X-Git-Tag: v8.2.0447 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bfcfd5784a2fe950d8e58d1d534bbbb4824524eb;p=vim patch 8.2.0447: terminal scroll tests fails on some systems Problem: Terminal scroll tests fails on some systems. Solution: Remove the fixed 100msec wait for Win32. Add a loop to wait until scrolling has finished. (James McCoy, closes #5842) --- diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index f56c7facf..f3571d4e4 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -298,13 +298,16 @@ func Test_terminal_scroll() let job = term_getjob(buf) call WaitForAssert({-> assert_equal("dead", job_status(job))}) call term_wait(buf) - if has('win32') - " TODO: this should not be needed - sleep 100m - endif - let scrolled = buf->term_getscrolled() - call assert_equal(scrolled, term_getscrolled(buf)) + " wait until the scrolling stops + while 1 + let scrolled = buf->term_getscrolled() + sleep 20m + if scrolled == buf->term_getscrolled() + break + endif + endwhile + call assert_equal('1', getline(1)) call assert_equal('1', term_getline(buf, 1 - scrolled)) call assert_equal('49', getline(49)) diff --git a/src/version.c b/src/version.c index 6b5e252a9..b54ac5aa9 100644 --- a/src/version.c +++ b/src/version.c @@ -738,6 +738,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 447, /**/ 446, /**/