aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.0922: terminal scrollback test is flaky

Browse Source 
Problem:    Terminal scrollback test is flaky.
Solution:   Wait a bit before running the tail command.
This commit is contained in:
Bram Moolenaar 2019-02-14 23:49:38 +01:00
parent 81aa0f56f8
commit 96baf02aa8
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/testdir/dumps/Test_terminal_01.dump
View File

@ -7,7 +7,7 @@
|4|8| @72 |4|8| @72
>4|9| @72 >4|9| @72
|~+0#4040ff13&| @73 |~+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#0000000#ffffff0@74
|~+0#4040ff13&| @73 |~+0#4040ff13&| @73
|~| @73 |~| @73

2
src/testdir/dumps/Test_terminal_02.dump
View File

@ -7,7 +7,7 @@
>4|8| @72 >4|8| @72
|4|9| @72 |4|9| @72
|~+0#4040ff13&| @73 |~+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#0000000#ffffff0@74
|~+0#4040ff13&| @73 |~+0#4040ff13&| @73
|~| @73 |~| @73

2
src/testdir/dumps/Test_terminal_03.dump
View File

@ -7,7 +7,7 @@
|4|9| @72 |4|9| @72
|o|n|e| |m|o|r|e| |l|i|n|e| @61 |o|n|e| |m|o|r|e| |l|i|n|e| @61
> @74 > @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#0000000#ffffff0@74
|~+0#4040ff13&| @73 |~+0#4040ff13&| @73
|~| @73 |~| @73

10
src/testdir/test_terminal.vim
View File

@ -311,6 +311,7 @@ func Test_terminal_postponed_scrollback()
call writefile(range(50), 'Xtext') call writefile(range(50), 'Xtext')
call writefile([ call writefile([
\ 'terminal', \ 'terminal',
\ 'sleep 100m',
\ 'call feedkeys("tail -n 100 -f Xtext\<CR>", "xt")', \ 'call feedkeys("tail -n 100 -f Xtext\<CR>", "xt")',
\ 'sleep 100m', \ 'sleep 100m',
\ 'call feedkeys("\<C-W>N", "xt")', \ 'call feedkeys("\<C-W>N", "xt")',
@ -318,21 +319,18 @@ func Test_terminal_postponed_scrollback()
let buf = RunVimInTerminal('-S XTest_postponed', {}) let buf = RunVimInTerminal('-S XTest_postponed', {})
" Check that the Xtext lines are displayed and in Terminal-Normal mode " Check that the Xtext lines are displayed and in Terminal-Normal mode
call term_wait(buf) 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 silent !echo 'one more line' >>Xtext
" Sceen will not change, move cursor to get a different dump " Sceen will not change, move cursor to get a different dump
call term_sendkeys(buf, "k") call term_sendkeys(buf, "k")
call term_wait(buf) 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. " Back to Terminal-Job mode, text will scroll and show the extra line.
call term_sendkeys(buf, "a") call term_sendkeys(buf, "a")
call term_wait(buf) 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_wait(buf)
call term_sendkeys(buf, "\<C-C>") call term_sendkeys(buf, "\<C-C>")

2
src/version.c
View File

@ -783,6 +783,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
922,
/**/ /**/
921, 921,
/**/ /**/