aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-12-22 11:14:04 +0800
committerGitHub <noreply@github.com>2022-12-22 11:14:04 +0800
commitf9c62ce3426fbdd333f0784f02bc6e72457f5a21 (patch)
treeecba7328ad545e7b0a9a07c6b707843e9f4f9b83
parent5d5fa886fff58bc4246501fbaaf7f63a72c0f0fe (diff)
downloadrneovim-f9c62ce3426fbdd333f0784f02bc6e72457f5a21.tar.gz
rneovim-f9c62ce3426fbdd333f0784f02bc6e72457f5a21.tar.bz2
rneovim-f9c62ce3426fbdd333f0784f02bc6e72457f5a21.zip
vim-patch:8.2.5142: startup test fails if there is a status bar (#21496)
Problem: Startup test fails if there is a status bar at the top of the screen. (Ernie Rael) Solution: Use a larger vertical offset in the test. https://github.com/vim/vim/commit/fa04eae5a5b9394079bde2d37ce6f9f8a5567d48 Co-authored-by: Bram Moolenaar <Bram@vim.org>
-rw-r--r--src/nvim/testdir/test_startup.vim8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/testdir/test_startup.vim b/src/nvim/testdir/test_startup.vim
index 7db033cb65..ee0445c6b4 100644
--- a/src/nvim/testdir/test_startup.vim
+++ b/src/nvim/testdir/test_startup.vim
@@ -520,7 +520,9 @@ func Test_geometry()
call writefile([&columns, &lines, getwinposx(), getwinposy(), string(getwinpos())], "Xtest_geometry")
qall
[CODE]
- if RunVim([], after, '-f -g -geometry 31x13+41+43')
+ " Some window managers have a bar at the top that pushes windows down,
+ " need to use at least 130, let's do 150
+ if RunVim([], after, '-f -g -geometry 31x13+41+150')
let lines = readfile('Xtest_geometry')
" Depending on the GUI library and the windowing system the final size
" might be a bit different, allow for some tolerance. Tuned based on
@@ -528,8 +530,8 @@ func Test_geometry()
call assert_inrange(31, 35, str2nr(lines[0]))
call assert_equal('13', lines[1])
call assert_equal('41', lines[2])
- call assert_equal('43', lines[3])
- call assert_equal('[41, 43]', lines[4])
+ call assert_equal('150', lines[3])
+ call assert_equal('[41, 150]', lines[4])
endif
endif