From ddbfe238a50dc846f2f722e9d870fc0dff5a2764 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 15 Mar 2020 20:33:40 +0100 Subject: 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. --- src/testdir/dumps/Test_terminal_01.dump | 20 -------------------- src/testdir/dumps/Test_terminal_02.dump | 20 -------------------- src/testdir/dumps/Test_terminal_03.dump | 20 -------------------- src/testdir/dumps/Test_terminal_scrollback_1.dump | 20 ++++++++++++++++++++ src/testdir/dumps/Test_terminal_scrollback_2.dump | 20 ++++++++++++++++++++ src/testdir/dumps/Test_terminal_scrollback_3.dump | 20 ++++++++++++++++++++ src/testdir/test_terminal.vim | 14 ++++++++------ src/version.c | 2 ++ 8 files changed, 70 insertions(+), 66 deletions(-) delete mode 100644 src/testdir/dumps/Test_terminal_01.dump delete mode 100644 src/testdir/dumps/Test_terminal_02.dump delete mode 100644 src/testdir/dumps/Test_terminal_03.dump create mode 100644 src/testdir/dumps/Test_terminal_scrollback_1.dump create mode 100644 src/testdir/dumps/Test_terminal_scrollback_2.dump create mode 100644 src/testdir/dumps/Test_terminal_scrollback_3.dump diff --git a/src/testdir/dumps/Test_terminal_01.dump b/src/testdir/dumps/Test_terminal_01.dump deleted file mode 100644 index a242bb797..000000000 --- a/src/testdir/dumps/Test_terminal_01.dump +++ /dev/null @@ -1,20 +0,0 @@ -|4+0&#ffffff0|2| @72 -|4|3| @72 -|4@1| @72 -|4|5| @72 -|4|6| @72 -|4|7| @72 -|4|8| @72 ->4|9| @72 -|~+0#4040ff13&| @73 -|!+2#ffffff16#00e0003|/|b|i|n|/|s|h| |[|T|e|r|m|i|n|a|l|]| @55 -| +0#0000000#ffffff0@74 -|~+0#4040ff13&| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|[+1#0000000&|N|o| |N|a|m|e|]| @65 -| +0&&@74 diff --git a/src/testdir/dumps/Test_terminal_02.dump b/src/testdir/dumps/Test_terminal_02.dump deleted file mode 100644 index 427a9ad4a..000000000 --- a/src/testdir/dumps/Test_terminal_02.dump +++ /dev/null @@ -1,20 +0,0 @@ -|4+0&#ffffff0|2| @72 -|4|3| @72 -|4@1| @72 -|4|5| @72 -|4|6| @72 -|4|7| @72 ->4|8| @72 -|4|9| @72 -|~+0#4040ff13&| @73 -|!+2#ffffff16#00e0003|/|b|i|n|/|s|h| |[|T|e|r|m|i|n|a|l|]| @55 -| +0#0000000#ffffff0@74 -|~+0#4040ff13&| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|[+1#0000000&|N|o| |N|a|m|e|]| @65 -| +0&&@74 diff --git a/src/testdir/dumps/Test_terminal_03.dump b/src/testdir/dumps/Test_terminal_03.dump deleted file mode 100644 index 079608844..000000000 --- a/src/testdir/dumps/Test_terminal_03.dump +++ /dev/null @@ -1,20 +0,0 @@ -|4+0&#ffffff0|3| @72 -|4@1| @72 -|4|5| @72 -|4|6| @72 -|4|7| @72 -|4|8| @72 -|4|9| @72 -|o|n|e| |m|o|r|e| |l|i|n|e| @61 -> @74 -|!+2#ffffff16#00e0003|/|b|i|n|/|s|h| |[|r|u|n@1|i|n|g|]| @56 -| +0#0000000#ffffff0@74 -|~+0#4040ff13&| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|[+1#0000000&|N|o| |N|a|m|e|]| @65 -| +0&&@74 diff --git a/src/testdir/dumps/Test_terminal_scrollback_1.dump b/src/testdir/dumps/Test_terminal_scrollback_1.dump new file mode 100644 index 000000000..a242bb797 --- /dev/null +++ b/src/testdir/dumps/Test_terminal_scrollback_1.dump @@ -0,0 +1,20 @@ +|4+0&#ffffff0|2| @72 +|4|3| @72 +|4@1| @72 +|4|5| @72 +|4|6| @72 +|4|7| @72 +|4|8| @72 +>4|9| @72 +|~+0#4040ff13&| @73 +|!+2#ffffff16#00e0003|/|b|i|n|/|s|h| |[|T|e|r|m|i|n|a|l|]| @55 +| +0#0000000#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|[+1#0000000&|N|o| |N|a|m|e|]| @65 +| +0&&@74 diff --git a/src/testdir/dumps/Test_terminal_scrollback_2.dump b/src/testdir/dumps/Test_terminal_scrollback_2.dump new file mode 100644 index 000000000..427a9ad4a --- /dev/null +++ b/src/testdir/dumps/Test_terminal_scrollback_2.dump @@ -0,0 +1,20 @@ +|4+0&#ffffff0|2| @72 +|4|3| @72 +|4@1| @72 +|4|5| @72 +|4|6| @72 +|4|7| @72 +>4|8| @72 +|4|9| @72 +|~+0#4040ff13&| @73 +|!+2#ffffff16#00e0003|/|b|i|n|/|s|h| |[|T|e|r|m|i|n|a|l|]| @55 +| +0#0000000#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|[+1#0000000&|N|o| |N|a|m|e|]| @65 +| +0&&@74 diff --git a/src/testdir/dumps/Test_terminal_scrollback_3.dump b/src/testdir/dumps/Test_terminal_scrollback_3.dump new file mode 100644 index 000000000..079608844 --- /dev/null +++ b/src/testdir/dumps/Test_terminal_scrollback_3.dump @@ -0,0 +1,20 @@ +|4+0&#ffffff0|3| @72 +|4@1| @72 +|4|5| @72 +|4|6| @72 +|4|7| @72 +|4|8| @72 +|4|9| @72 +|o|n|e| |m|o|r|e| |l|i|n|e| @61 +> @74 +|!+2#ffffff16#00e0003|/|b|i|n|/|s|h| |[|r|u|n@1|i|n|g|]| @56 +| +0#0000000#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|[+1#0000000&|N|o| |N|a|m|e|]| @65 +| +0&&@74 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, "\") - call term_wait(buf) + call term_wait(buf, 50) + " stop shell call term_sendkeys(buf, "exit\") - call term_wait(buf) + call term_wait(buf, 100) + " close terminal window let tsk_ret = term_sendkeys(buf, ":q\") " 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, /**/ -- cgit v1.2.1