diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-03-29 17:50:48 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-03-29 17:50:48 +0200 |
| commit | 52ea92b19d2bc992dd4570add64c12d98eab9db2 (patch) | |
| tree | 50fa73402877fc3fedf6ffe227922752b4d7dfdc | |
| parent | bf54dbeb5ccd2cfb9cc0687fd71ac3b3eddce0da (diff) | |
patch 8.2.0476: terminal nasty callback test fails sometimesv8.2.0476
Problem: Terminal nasty callback test fails sometimes.
Solution: use term_wait() instead of a sleep. (Yee Cheng Chin,closes #5865)
| -rw-r--r-- | src/testdir/test_terminal.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index c48ff4e26b..40749c4af5 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -2536,17 +2536,19 @@ func Test_term_nasty_callback() let g:buf1 = term_start('sh', #{hidden: 1, term_finish: 'close'}) call popup_create(g:buf1, {}) let g:buf2 = term_start(['sh', '-c'], #{curwin: 1, exit_cb: function('TermExit')}) - sleep 100m + call term_wait(g:buf2, 100) call popup_close(win_getid()) endfunc func TermExit(...) - call term_sendkeys(bufnr('#'), "exit\<CR>") + let altbuf = bufnr('#') + call term_sendkeys(altbuf, "exit\<CR>") + call term_wait(altbuf) call popup_close(win_getid()) endfunc call OpenTerms() call term_sendkeys(g:buf0, "exit\<CR>") - sleep 100m + call term_wait(g:buf0, 100) exe g:buf0 .. 'bwipe!' set hidden& endfunc diff --git a/src/version.c b/src/version.c index 69afadf0d9..73de61c4b8 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 */ /**/ + 476, +/**/ 475, /**/ 474, |