diff options
| author | ichizok <gclient.gaap@gmail.com> | 2021-12-12 16:42:09 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-12-12 16:42:09 +0000 |
| commit | fa9a8e0fd1143d2b47611c6cc13e32f6283448a4 (patch) | |
| tree | ea1534407f0a03ff5c03c2a1d14db6be6f2c679f /src | |
| parent | 6ae8fae8696623b527c7fb22567f6a3705b2f0dd (diff) | |
| download | vim-git-fa9a8e0fd1143d2b47611c6cc13e32f6283448a4.tar.gz | |
patch 8.2.3789: Test_window_minimal_size can fail on a slow machinev8.2.3789
Problem: Test_window_minimal_size can fail on a slow machine.
Solution: Do not rely on timers firing at the expected time. (Ozaki Kiichi,
closes #9335)
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_window_cmd.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim index 68c44a0c3..a55567f90 100644 --- a/src/testdir/test_window_cmd.vim +++ b/src/testdir/test_window_cmd.vim @@ -1379,13 +1379,17 @@ func Test_window_minimal_size() if has('timers') " check size is fixed in Insert mode + func s:CheckSize(timer) abort + call win_execute(win_getid(2), 'wincmd _') + call assert_equal(0, winheight(0)) + call feedkeys(" \<Esc>", 't!') + endfunc new - call timer_start(100, {_ -> win_execute(win_getid(2), 'wincmd _')}) - call timer_start(200, {_ -> assert_equal(0, winheight(0))}) - call timer_start(300, {_ -> feedkeys(" \<Esc>", 't!')}) + call timer_start(100, function('s:CheckSize')) call feedkeys('a', 'tx!') call assert_equal(1, winheight(0)) bwipe! + delfunc s:CheckSize endif set winminwidth& winminheight& diff --git a/src/version.c b/src/version.c index 09bbb9155..ac574d530 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3789, +/**/ 3788, /**/ 3787, |