diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-05-22 14:44:26 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-05-22 14:44:26 +0200 |
| commit | 9cdcd1d0dc3bbea41b731639fd2431c2ef5cffaa (patch) | |
| tree | 7be369c23ec430a79958e7b34ead3bdd3a28789c | |
| parent | 2e61e2d08390623fcf933fd06646ac91f81fb772 (diff) | |
| download | vim-git-9cdcd1d0dc3bbea41b731639fd2431c2ef5cffaa.tar.gz | |
patch 8.2.0811: terminal keycode test is flakyv8.2.0811
Problem: Terminal keycode test is flaky.
Solution: Use WaitForAssert()
| -rw-r--r-- | src/testdir/test_terminal.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 395de5207..bb9cdc773 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -2493,6 +2493,7 @@ func Test_terminal_in_popup() call term_sendkeys(buf, ":call OpenTerm(1)\<CR>") call TermWait(buf, 150) call term_sendkeys(buf, ":set hlsearch\<CR>") + call TermWait(buf, 100) call term_sendkeys(buf, "/edit\<CR>") call VerifyScreenDump(buf, 'Test_terminal_popup_3', {}) @@ -2517,7 +2518,7 @@ func Test_terminal_in_popup() call TermWait(buf, 50) call term_sendkeys(buf, ":q\<CR>") - call TermWait(buf, 100) " wait for terminal to vanish + call TermWait(buf, 150) " wait for terminal to vanish call StopVimInTerminal(buf) call delete('Xtext') @@ -2704,8 +2705,7 @@ func Test_term_keycode_translation() call term_sendkeys(buf, "i") for i in range(len(keys)) call term_sendkeys(buf, "\<C-U>\<C-K>" .. keys[i]) - call term_wait(buf) - call assert_equal(output[i], term_getline(buf, 1)) + call WaitForAssert({-> assert_equal(output[i], term_getline(buf, 1))}) endfor let keypad_keys = ["\<k0>", "\<k1>", "\<k2>", "\<k3>", "\<k4>", "\<k5>", @@ -2720,13 +2720,11 @@ func Test_term_keycode_translation() continue endif call term_sendkeys(buf, "\<C-U>" .. keypad_keys[i]) - call term_wait(buf) - call assert_equal(keypad_output[i], term_getline(buf, 1)) + call WaitForAssert({-> assert_equal(keypad_output[i], term_getline(buf, 1))}) endfor call feedkeys("\<C-U>\<kEnter>\<BS>one\<C-W>.two", 'xt') - call term_wait(buf) - call assert_equal('two', term_getline(buf, 1)) + call WaitForAssert({-> assert_equal('two', term_getline(buf, 1))}) call StopVimInTerminal(buf) endfunc diff --git a/src/version.c b/src/version.c index 9e8ba9288..3bd0ec468 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 811, +/**/ 810, /**/ 809, |