changeset 19667:a088571e1d9d v8.2.0390

patch 8.2.0390: terminal postponed scrollback test is flaky Commit: https://github.com/vim/vim/commit/ddbfe238a50dc846f2f722e9d870fc0dff5a2764 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 15 20:33:40 2020 +0100 patch 8.2.0390: terminal postponed scrollback test is flaky Problem: Terminal postponed scrollback test is flaky. Solution: Add delay in between sending keys. Rename dump files.
author Bram Moolenaar <Bram@vim.org>
date Sun, 15 Mar 2020 20:45:04 +0100
parents d758539f6e00
children 1d074dc7260f
files src/testdir/dumps/Test_terminal_01.dump src/testdir/dumps/Test_terminal_02.dump src/testdir/dumps/Test_terminal_03.dump src/testdir/dumps/Test_terminal_scrollback_1.dump src/testdir/dumps/Test_terminal_scrollback_2.dump src/testdir/dumps/Test_terminal_scrollback_3.dump src/testdir/test_terminal.vim src/version.c
diffstat 8 files changed, 70 insertions(+), 66 deletions(-) [+]
line wrap: on
line diff
rename from src/testdir/dumps/Test_terminal_01.dump
rename to src/testdir/dumps/Test_terminal_scrollback_1.dump
rename from src/testdir/dumps/Test_terminal_02.dump
rename to src/testdir/dumps/Test_terminal_scrollback_2.dump
rename from src/testdir/dumps/Test_terminal_03.dump
rename to src/testdir/dumps/Test_terminal_scrollback_3.dump
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -352,22 +352,24 @@ func Test_terminal_postponed_scrollback(
 	\ ], 'XTest_postponed')
   let buf = RunVimInTerminal('-S XTest_postponed', {})
   " Check that the Xtext lines are displayed and in Terminal-Normal mode
-  call VerifyScreenDump(buf, 'Test_terminal_01', {})
+  call VerifyScreenDump(buf, 'Test_terminal_scrollback_1', {})
 
   silent !echo 'one more line' >>Xtext
   " Screen will not change, move cursor to get a different dump
   call term_sendkeys(buf, "k")
-  call VerifyScreenDump(buf, 'Test_terminal_02', {})
+  call VerifyScreenDump(buf, 'Test_terminal_scrollback_2', {})
 
   " Back to Terminal-Job mode, text will scroll and show the extra line.
   call term_sendkeys(buf, "a")
-  call VerifyScreenDump(buf, 'Test_terminal_03', {})
+  call VerifyScreenDump(buf, 'Test_terminal_scrollback_3', {})
 
-  call term_wait(buf)
+  " stop "tail -f"
   call term_sendkeys(buf, "\<C-C>")
-  call term_wait(buf)
+  call term_wait(buf, 50)
+  " stop shell
   call term_sendkeys(buf, "exit\<CR>")
-  call term_wait(buf)
+  call term_wait(buf, 100)
+  " close terminal window
   let tsk_ret = term_sendkeys(buf, ":q\<CR>")
 
   " check type of term_sendkeys() return value
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    390,
+/**/
     389,
 /**/
     388,