diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-03-15 20:33:40 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-03-15 20:33:40 +0100 |
| commit | ddbfe238a50dc846f2f722e9d870fc0dff5a2764 (patch) | |
| tree | a4293981217c5a4b8713d7a88a6be7cad98de0d2 | |
| parent | e4fc746d13f5b6a0b5c3a8efdff7de1454c3297d (diff) | |
| download | vim-git-ddbfe238a50dc846f2f722e9d870fc0dff5a2764.tar.gz | |
patch 8.2.0390: terminal postponed scrollback test is flakyv8.2.0390
Problem: Terminal postponed scrollback test is flaky.
Solution: Add delay in between sending keys. Rename dump files.
| -rw-r--r-- | src/testdir/dumps/Test_terminal_scrollback_1.dump (renamed from src/testdir/dumps/Test_terminal_01.dump) | 0 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_terminal_scrollback_2.dump (renamed from src/testdir/dumps/Test_terminal_02.dump) | 0 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_terminal_scrollback_3.dump (renamed from src/testdir/dumps/Test_terminal_03.dump) | 0 | ||||
| -rw-r--r-- | src/testdir/test_terminal.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 10 insertions, 6 deletions
diff --git a/src/testdir/dumps/Test_terminal_01.dump b/src/testdir/dumps/Test_terminal_scrollback_1.dump index a242bb797..a242bb797 100644 --- a/src/testdir/dumps/Test_terminal_01.dump +++ b/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 index 427a9ad4a..427a9ad4a 100644 --- a/src/testdir/dumps/Test_terminal_02.dump +++ b/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 index 079608844..079608844 100644 --- a/src/testdir/dumps/Test_terminal_03.dump +++ b/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 @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 390, +/**/ 389, /**/ 388, |