diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-12-02 15:06:07 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-12-02 15:06:07 +0000 |
| commit | 9c8d12c8115640927823919001a03c79d4118063 (patch) | |
| tree | a00ca7e3236c21958abd4d72ab952b2cbd343c08 | |
| parent | b55ae8ce42c8a83d14bfde2c138fcc74f447de68 (diff) | |
| download | vim-git-9c8d12c8115640927823919001a03c79d4118063.tar.gz | |
patch 9.0.0989: popupwin test is more flaky on MacOSv9.0.0989
Problem: Popupwin test is more flaky on MacOS.
Solution: Use a longer wait time.
| -rw-r--r-- | src/testdir/test_popupwin.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index 2aebea495..cd68bfd01 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -1197,8 +1197,11 @@ func Test_popup_time() call assert_equal(0, popup_locate(1, 21)) call assert_equal(0, popup_locate(2, 1)) - sleep 700m + " Mac is usually a bit slow + let delay = has('mac') ? '900m' : '700m' + exe 'sleep ' .. delay redraw + let line = join(map(range(1, 5), '1->screenstring(v:val)'), '') call assert_equal('hello', line) @@ -1212,7 +1215,7 @@ func Test_popup_time() let line = join(map(range(1, 30), 'screenstring(&lines, v:val)'), '') call assert_match('.*on the command line.*', line) - sleep 700m + exe 'sleep ' .. delay redraw let line = join(map(range(1, 30), 'screenstring(&lines, v:val)'), '') call assert_notmatch('.*on the command line.*', line) diff --git a/src/version.c b/src/version.c index 4cb746e18..6583d462a 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 989, +/**/ 988, /**/ 987, |