# HG changeset patch # User Bram Moolenaar # Date 1597941004 -7200 # Node ID 0ae284aaa8a2448a6817f1e14cbda304355cdc5b # Parent 0a3a52ec5f4c924a5b6a918207e56274d04d9c3a patch 8.2.1497: CursorHold test is flaky Commit: https://github.com/vim/vim/commit/17f67547f36a06220ea4667aaee7bb130108f568 Author: Bram Moolenaar Date: Thu Aug 20 18:29:13 2020 +0200 patch 8.2.1497: CursorHold test is flaky Problem: CursorHold test is flaky. (Jakub K?dzio?ka) Solution: Use WaitForAssert() (closes https://github.com/vim/vim/issues/6754) diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -29,20 +29,19 @@ func Test_CursorHold_autocmd() END call writefile(before, 'Xinit') let buf = RunVimInTerminal('-S Xinit Xfile', {}) - call term_wait(buf) + call term_sendkeys(buf, "G") + call term_wait(buf, 20) call term_sendkeys(buf, "gg") call term_wait(buf) - sleep 50m + call WaitForAssert({-> assert_equal(['1'], readfile('Xoutput')[-1:-1])}) call term_sendkeys(buf, "j") call term_wait(buf) - sleep 50m + call WaitForAssert({-> assert_equal(['1', '2'], readfile('Xoutput')[-2:-1])}) call term_sendkeys(buf, "j") call term_wait(buf) - sleep 50m + call WaitForAssert({-> assert_equal(['1', '2', '3'], readfile('Xoutput')[-3:-1])}) call StopVimInTerminal(buf) - call assert_equal(['1', '2', '3'], readfile('Xoutput')[-3:-1]) - call delete('Xinit') call delete('Xoutput') call delete('Xfile') diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1497, +/**/ 1496, /**/ 1495,