From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 15 Mar 2020 19:33:40 +0000 (+0100)
Subject: patch 8.2.0390: terminal postponed scrollback test is flaky
X-Git-Tag: v8.2.0390
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ddbfe238a50dc846f2f722e9d870fc0dff5a2764;p=vim

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.
---

diff --git a/src/testdir/dumps/Test_terminal_01.dump b/src/testdir/dumps/Test_terminal_scrollback_1.dump
similarity index 100%
rename from src/testdir/dumps/Test_terminal_01.dump
rename to src/testdir/dumps/Test_terminal_scrollback_1.dump
diff --git a/src/testdir/dumps/Test_terminal_02.dump b/src/testdir/dumps/Test_terminal_scrollback_2.dump
similarity index 100%
rename from src/testdir/dumps/Test_terminal_02.dump
rename to src/testdir/dumps/Test_terminal_scrollback_2.dump
diff --git a/src/testdir/dumps/Test_terminal_03.dump b/src/testdir/dumps/Test_terminal_scrollback_3.dump
similarity index 100%
rename from src/testdir/dumps/Test_terminal_03.dump
rename to src/testdir/dumps/Test_terminal_scrollback_3.dump
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index d763f78a7..7f057e2a5 100644
--- 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
diff --git a/src/version.c b/src/version.c
index fede5ead8..33bdb39bb 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 */
+/**/
+    390,
 /**/
     389,
 /**/