diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-02-14 23:49:38 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-02-14 23:49:38 +0100 |
| commit | 96baf02aa87dc6ec43850c5617fe53061edd97bf (patch) | |
| tree | a67a26d677a463a88bf9c07ad3fe140b2838fcdd | |
| parent | 81aa0f56f8be6922730f1ca368d6c64661dc97a3 (diff) | |
| download | vim-git-96baf02aa87dc6ec43850c5617fe53061edd97bf.tar.gz | |
patch 8.1.0922: terminal scrollback test is flakyv8.1.0922
Problem: Terminal scrollback test is flaky.
Solution: Wait a bit before running the tail command.
| -rw-r--r-- | src/testdir/dumps/Test_terminal_01.dump | 2 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_terminal_02.dump | 2 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_terminal_03.dump | 2 | ||||
| -rw-r--r-- | src/testdir/test_terminal.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/testdir/dumps/Test_terminal_01.dump b/src/testdir/dumps/Test_terminal_01.dump index 22dd32356..4a0014f05 100644 --- 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 495d2d2f5..b9dfdbe2a 100644 --- 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 a2883f657..6bc6ee790 100644 --- 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 ba06f3623..9529b764c 100644 --- 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 d0857e7f9..bf47f97b3 100644 --- a/src/version.c +++ b/src/version.c @@ -784,6 +784,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 922, +/**/ 921, /**/ 920, |