diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-05-13 23:24:12 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-05-13 23:24:12 +0200 |
| commit | e06a28f5e30f439545ac125d54ffc4e6bd6daada (patch) | |
| tree | 0d8ce1cd524a503059a6f72d27e68a6e710db9ce | |
| parent | 2b72821924ff514727b60fb0b647d5caae8336f7 (diff) | |
| download | vim-git-e06a28f5e30f439545ac125d54ffc4e6bd6daada.tar.gz | |
patch 8.2.0752: terminal in popup window test is a bit flakyv8.2.0752
Problem: Terminal in popup window test is a bit flaky.
Solution: Wait for shell job status to be "run". Mark as flaky test.
| -rw-r--r-- | src/testdir/test_popupwin.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index a664346df..feaa5e4c0 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -2422,12 +2422,15 @@ endfunc func Test_popupwin_terminal_buffer() CheckFeature terminal CheckUnix + " Starting a terminal to run a shell in is considered flaky. + let g:test_is_flaky = 1 let origwin = win_getid() let ptybuf = term_start(&shell, #{hidden: 1}) let winid = popup_create(ptybuf, #{minwidth: 40, minheight: 10}) " Wait for shell to start - sleep 200m + call WaitForAssert({-> assert_equal("run", job_status(term_getjob(ptybuf)))}) + sleep 100m " Check this doesn't crash call assert_equal(winnr(), winnr('j')) call assert_equal(winnr(), winnr('k')) diff --git a/src/version.c b/src/version.c index 0d0af788f..3f67db451 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 */ /**/ + 752, +/**/ 751, /**/ 750, |