From 145d9ed0fcedd7bc61a2881a7c8f2d21ed52939f Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 12 Nov 2023 08:18:40 +0800 Subject: vim-patch:9.0.2100: CI: test_termdebug fails (#25997) Problem: CI: test_termdebug fails Solution: only test for a changed winlayout, if the window width actually changed Also, include an unrelated comment (which doesn't warrant its own patch number) https://github.com/vim/vim/commit/305127f9f2f6058b4ec071041a2c98f76114a9b0 Co-authored-by: Christian Brabandt --- test/old/testdir/test_termdebug.vim | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'test') diff --git a/test/old/testdir/test_termdebug.vim b/test/old/testdir/test_termdebug.vim index ab1a76000a..f13850cb62 100644 --- a/test/old/testdir/test_termdebug.vim +++ b/test/old/testdir/test_termdebug.vim @@ -97,16 +97,22 @@ func Test_termdebug_basic() bw! endif set columns=160 + let winw = winwidth(0) Var - call assert_equal(winnr(), winnr('$') - 1) - call assert_equal(winlayout(), ['col', [['leaf', 1002], ['leaf', 1001], ['row', [['leaf', 1003 + cn], ['leaf', 1000]]]]]) - let cn += 1 - bw! + if winwidth(0) < winw + call assert_equal(winnr(), winnr('$') - 1) + call assert_equal(winlayout(), ['col', [['leaf', 1002], ['leaf', 1001], ['row', [['leaf', 1003 + cn], ['leaf', 1000]]]]]) + let cn += 1 + bw! + endif + let winw = winwidth(0) Asm - call assert_equal(winnr(), winnr('$') - 1) - call assert_equal(winlayout(), ['col', [['leaf', 1002], ['leaf', 1001], ['row', [['leaf', 1003 + cn], ['leaf', 1000]]]]]) - let cn += 1 - bw! + if winwidth(0) < winw + call assert_equal(winnr(), winnr('$') - 1) + call assert_equal(winlayout(), ['col', [['leaf', 1002], ['leaf', 1001], ['row', [['leaf', 1003 + cn], ['leaf', 1000]]]]]) + let cn += 1 + bw! + endif set columns& wincmd t -- cgit