patch 8.1.0922: terminal scrollback test is flaky

Problem:    Terminal scrollback test is flaky.
Solution:   Wait a bit before running the tail command.

diff --git a/src/testdir/dumps/Test_terminal_01.dump b/src/testdir/dumps/Test_terminal_01.dump
index 22dd32356fc42d3193653fbcb0f8f4fcc7ea4fb5..4a0014f05cc08393bfe1c70b92a2bd8c4dc288c1 100644 (file)
--- a/src/testdir/dumps/Test_terminal_01.dump
+++ b/src/testdir/dumps/Test_terminal_01.dump
@@ -7,7 +7,7 @@
 |4|8| @72
 >4|9| @72
 |~+0#4040ff13&| @73
-|!+2#ffffff16#00e0003|/|b|i|n|/|t|c|s|h| |[|T|e|r|m|i|n|a|l|]| @35|5|2|,|1| @10|B|o|t
+|!+2#ffffff16#00e0003|/|b|i|n|/|t|c|s|h| |[|T|e|r|m|i|n|a|l|]| @35|5|1|,|1| @10|B|o|t
 | +0#0000000#ffffff0@74
 |~+0#4040ff13&| @73
 |~| @73

diff --git a/src/testdir/dumps/Test_terminal_02.dump b/src/testdir/dumps/Test_terminal_02.dump
index 495d2d2f5821f95341ad605054e55d896a2607a3..b9dfdbe2a8d7fdaac1423459845f75f1df064b20 100644 (file)
--- a/src/testdir/dumps/Test_terminal_02.dump
+++ b/src/testdir/dumps/Test_terminal_02.dump
@@ -7,7 +7,7 @@
 >4|8| @72
 |4|9| @72
 |~+0#4040ff13&| @73
-|!+2#ffffff16#00e0003|/|b|i|n|/|t|c|s|h| |[|T|e|r|m|i|n|a|l|]| @35|5|1|,|1| @10|B|o|t
+|!+2#ffffff16#00e0003|/|b|i|n|/|t|c|s|h| |[|T|e|r|m|i|n|a|l|]| @35|5|0|,|1| @10|B|o|t
 | +0#0000000#ffffff0@74
 |~+0#4040ff13&| @73
 |~| @73

diff --git a/src/testdir/dumps/Test_terminal_03.dump b/src/testdir/dumps/Test_terminal_03.dump
index a2883f657f65f1e46ddfe8e7c65060288748ce59..6bc6ee790a92f531e7cbaeb185915c230c42e8f8 100644 (file)
--- a/src/testdir/dumps/Test_terminal_03.dump
+++ b/src/testdir/dumps/Test_terminal_03.dump
@@ -7,7 +7,7 @@
 |4|9| @72
 |o|n|e| |m|o|r|e| |l|i|n|e| @61
 > @74
-|!+2#ffffff16#00e0003|/|b|i|n|/|t|c|s|h| |[|r|u|n@1|i|n|g|]| @36|4@1|,|1| @10|B|o|t
+|!+2#ffffff16#00e0003|/|b|i|n|/|t|c|s|h| |[|r|u|n@1|i|n|g|]| @36|4|3|,|1| @10|B|o|t
 | +0#0000000#ffffff0@74
 |~+0#4040ff13&| @73
 |~| @73

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index ba06f36235655ae12300c4194de7ae0539938dbb..9529b764c804e52e5832d23790815e710070b1dd 100644 (file)
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -311,6 +311,7 @@ func Test_terminal_postponed_scrollback()
   call writefile(range(50), 'Xtext')
   call writefile([
        \ 'terminal',
+       \ 'sleep 100m',
        \ 'call feedkeys("tail -n 100 -f Xtext\<CR>", "xt")',
        \ 'sleep 100m',
        \ 'call feedkeys("\<C-W>N", "xt")',
@@ -318,21 +319,18 @@ func Test_terminal_postponed_scrollback()
   let buf = RunVimInTerminal('-S XTest_postponed', {})
   " Check that the Xtext lines are displayed and in Terminal-Normal mode
   call term_wait(buf)
-  " TODO: this sometimes fails
-  "call VerifyScreenDump(buf, 'Test_terminal_01', {})
+  call VerifyScreenDump(buf, 'Test_terminal_01', {})
 
   silent !echo 'one more line' >>Xtext
   " Sceen will not change, move cursor to get a different dump
   call term_sendkeys(buf, "k")
   call term_wait(buf)
-  " TODO: this sometimes fails
-  "call VerifyScreenDump(buf, 'Test_terminal_02', {})
+  call VerifyScreenDump(buf, 'Test_terminal_02', {})
 
   " Back to Terminal-Job mode, text will scroll and show the extra line.
   call term_sendkeys(buf, "a")
   call term_wait(buf)
-  " TODO: this sometimes fails
-  "call VerifyScreenDump(buf, 'Test_terminal_03', {})
+  call VerifyScreenDump(buf, 'Test_terminal_03', {})
 
   call term_wait(buf)
   call term_sendkeys(buf, "\<C-C>")

diff --git a/src/version.c b/src/version.c
index d0857e7f954b2422da0834534c8e532076b9acb9..bf47f97b383de25426fc726db18e947b3bfac9e8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -783,6 +783,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    922,
 /**/
     921,
 /**/