• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revisioneb8715fac6c3cf8f1cd168975e3fe14040c0d83a (tree)
Time2020-05-22 21:45:03
AuthorBram Moolenaar <Bram@vim....>
CommiterBram Moolenaar

Log Message

patch 8.2.0811: terminal keycode test is flaky

Commit: https://github.com/vim/vim/commit/9cdcd1d0dc3bbea41b731639fd2431c2ef5cffaa
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri May 22 14:44:26 2020 +0200

patch 8.2.0811: terminal keycode test is flaky
Problem: Terminal keycode test is flaky.
Solution: Use WaitForAssert()

Change Summary

Incremental Difference

diff -r 903e2ba583e5 -r eb8715fac6c3 src/testdir/test_terminal.vim
--- a/src/testdir/test_terminal.vim Fri May 22 14:15:04 2020 +0200
+++ b/src/testdir/test_terminal.vim Fri May 22 14:45:03 2020 +0200
@@ -2493,6 +2493,7 @@
24932493 call term_sendkeys(buf, ":call OpenTerm(1)\<CR>")
24942494 call TermWait(buf, 150)
24952495 call term_sendkeys(buf, ":set hlsearch\<CR>")
2496+ call TermWait(buf, 100)
24962497 call term_sendkeys(buf, "/edit\<CR>")
24972498 call VerifyScreenDump(buf, 'Test_terminal_popup_3', {})
24982499
@@ -2517,7 +2518,7 @@
25172518
25182519 call TermWait(buf, 50)
25192520 call term_sendkeys(buf, ":q\<CR>")
2520- call TermWait(buf, 100) " wait for terminal to vanish
2521+ call TermWait(buf, 150) " wait for terminal to vanish
25212522
25222523 call StopVimInTerminal(buf)
25232524 call delete('Xtext')
@@ -2704,8 +2705,7 @@
27042705 call term_sendkeys(buf, "i")
27052706 for i in range(len(keys))
27062707 call term_sendkeys(buf, "\<C-U>\<C-K>" .. keys[i])
2707- call term_wait(buf)
2708- call assert_equal(output[i], term_getline(buf, 1))
2708+ call WaitForAssert({-> assert_equal(output[i], term_getline(buf, 1))})
27092709 endfor
27102710
27112711 let keypad_keys = ["\<k0>", "\<k1>", "\<k2>", "\<k3>", "\<k4>", "\<k5>",
@@ -2720,13 +2720,11 @@
27202720 continue
27212721 endif
27222722 call term_sendkeys(buf, "\<C-U>" .. keypad_keys[i])
2723- call term_wait(buf)
2724- call assert_equal(keypad_output[i], term_getline(buf, 1))
2723+ call WaitForAssert({-> assert_equal(keypad_output[i], term_getline(buf, 1))})
27252724 endfor
27262725
27272726 call feedkeys("\<C-U>\<kEnter>\<BS>one\<C-W>.two", 'xt')
2728- call term_wait(buf)
2729- call assert_equal('two', term_getline(buf, 1))
2727+ call WaitForAssert({-> assert_equal('two', term_getline(buf, 1))})
27302728
27312729 call StopVimInTerminal(buf)
27322730 endfunc
diff -r 903e2ba583e5 -r eb8715fac6c3 src/version.c
--- a/src/version.c Fri May 22 14:15:04 2020 +0200
+++ b/src/version.c Fri May 22 14:45:03 2020 +0200
@@ -747,6 +747,8 @@
747747 static int included_patches[] =
748748 { /* Add new patch number below this line */
749749 /**/
750+ 811,
751+/**/
750752 810,
751753 /**/
752754 809,
Show on old repository browser