From 781a91ac54fc7e647a0d2d85df9a4b884fb28ee8 Mon Sep 17 00:00:00 2001 From: thinca Date: Tue, 9 Jun 2026 18:39:52 +0000 Subject: [PATCH] patch 9.2.0605: tests: Test_screenpos() is flaky in GUI Problem: Test_screenpos() fails intermittently in the GUI testgui CI job with "Expected {'row': 22} but got {'row': 23}". In the GUI, the window height reported by getwininfo() before the final redraw can be stale, so the cached wininfo.height does not match the actual window height when the assertion runs. Solution: Use winheight(winid) at assertion time so the height reflects the window state after the redraw. closes: #20457 Signed-off-by: thinca Signed-off-by: Christian Brabandt --- src/testdir/test_cursor_func.vim | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_cursor_func.vim b/src/testdir/test_cursor_func.vim index e541da886d..9aaeb5d47d 100644 --- a/src/testdir/test_cursor_func.vim +++ b/src/testdir/test_cursor_func.vim @@ -125,7 +125,7 @@ func Test_screenpos() exe "normal G\\" redraw let winbar_height = get(wininfo, 'winbar', 0) - call assert_equal({'row': winrow + wininfo.height - 1 + winbar_height, + call assert_equal({'row': winrow + winheight(winid) - 1 + winbar_height, \ 'col': wincol + 7, \ 'curscol': wincol + 7, \ 'endcol': wincol + 7}, winid->screenpos(line('$'), 8)) diff --git a/src/version.c b/src/version.c index b5cae5ec4e..68013a0ea5 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 605, /**/ 604, /**/