patch 9.2.0429: tests: flaky screendump Test_smoothscroll_incsearch()
Commit:
https://github.com/vim/vim/commit/e25933014c1c7cc4fb40a6ed429b80fdb37ba28e
Author: Yasuhiro Matsumoto <[email protected]>
Date: Sat May 2 13:29:01 2026 +0000
patch 9.2.0429: tests: flaky screendump Test_smoothscroll_incsearch()
Problem: tests: flaky screendump Test_smoothscroll_incsearch()
Solution: Replace screendump test by WaitForAssert()
(Yasuhiro Matsumoto)
VerifyScreenDump fails consistently on the macos-15-intel CI runner.
Replace the dump comparisons with assertions that verify the actual
invariant under test: that the visible buffer view stays unchanged
across the four incremental-search keystrokes (i.e. skipcol is not
reset). Drop the now-unused dump files.
closes: #20118
Signed-off-by: Yasuhiro Matsumoto <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/testdir/dumps/Test_smooth_incsearch_1.dump
b/src/testdir/dumps/Test_smooth_incsearch_1.dump
deleted file mode 100644
index 830b855d1..000000000
--- a/src/testdir/dumps/Test_smooth_incsearch_1.dump
+++ /dev/null
@@ -1,8 +0,0 @@
-|<+0#4040ff13#ffffff0@2| +0#af5f00255&|a+0#0000000&@27| @7
-| +0#af5f00255&|1|2| | +0#0000000&@35
-| +0#af5f00255&|1|3| | +0#0000000&@35
-| +0#af5f00255&|1|4| |b+1#0000000&|b+0&&@2| @31
-| +0#af5f00255&|1|5| | +0#0000000&@35
-| +0#af5f00255&|1|6| | +0#0000000&@35
-| +0#af5f00255&|1|7| | +0#0000000&@35
-|/|b> @37
diff --git a/src/testdir/dumps/Test_smooth_incsearch_2.dump
b/src/testdir/dumps/Test_smooth_incsearch_2.dump
deleted file mode 100644
index 349e12861..000000000
--- a/src/testdir/dumps/Test_smooth_incsearch_2.dump
+++ /dev/null
@@ -1,8 +0,0 @@
-|<+0#4040ff13#ffffff0@2| +0#af5f00255&|a+0#0000000&@27| @7
-| +0#af5f00255&|1|2| | +0#0000000&@35
-| +0#af5f00255&|1|3| | +0#0000000&@35
-| +0#af5f00255&|1|4| |b+1#0000000&@1|b+0&&@1| @31
-| +0#af5f00255&|1|5| | +0#0000000&@35
-| +0#af5f00255&|1|6| | +0#0000000&@35
-| +0#af5f00255&|1|7| | +0#0000000&@35
-|/|b@1> @36
diff --git a/src/testdir/dumps/Test_smooth_incsearch_3.dump
b/src/testdir/dumps/Test_smooth_incsearch_3.dump
deleted file mode 100644
index 0be3d2193..000000000
--- a/src/testdir/dumps/Test_smooth_incsearch_3.dump
+++ /dev/null
@@ -1,8 +0,0 @@
-|<+0#4040ff13#ffffff0@2| +0#af5f00255&|a+0#0000000&@27| @7
-| +0#af5f00255&|1|2| | +0#0000000&@35
-| +0#af5f00255&|1|3| | +0#0000000&@35
-| +0#af5f00255&|1|4| |b+1#0000000&@2|b+0&&| @31
-| +0#af5f00255&|1|5| | +0#0000000&@35
-| +0#af5f00255&|1|6| | +0#0000000&@35
-| +0#af5f00255&|1|7| | +0#0000000&@35
-|/|b@2> @35
diff --git a/src/testdir/dumps/Test_smooth_incsearch_4.dump
b/src/testdir/dumps/Test_smooth_incsearch_4.dump
deleted file mode 100644
index c81c24b40..000000000
--- a/src/testdir/dumps/Test_smooth_incsearch_4.dump
+++ /dev/null
@@ -1,8 +0,0 @@
-|<+0#4040ff13#ffffff0@2| +0#af5f00255&|a+0#0000000&@27| @7
-| +0#af5f00255&|1|2| | +0#0000000&@35
-| +0#af5f00255&|1|3| | +0#0000000&@35
-| +0#af5f00255&|1|4| |b+1#0000000&@3| +0&&@31
-| +0#af5f00255&|1|5| | +0#0000000&@35
-| +0#af5f00255&|1|6| | +0#0000000&@35
-| +0#af5f00255&|1|7| | +0#0000000&@35
-|/|b@3> @34
diff --git a/src/testdir/test_scroll_opt.vim b/src/testdir/test_scroll_opt.vim
index 7ee9fa2d2..6d4fc81b8 100644
--- a/src/testdir/test_scroll_opt.vim
+++ b/src/testdir/test_scroll_opt.vim
@@ -903,7 +903,7 @@ endfunc
" skipcol should not reset when doing incremental search on the same word
func Test_smoothscroll_incsearch()
- CheckScreendump
+ CheckRunVimInTerminal
let lines =<< trim END
set smoothscroll number scrolloff=0 incsearch
@@ -913,15 +913,24 @@ func Test_smoothscroll_incsearch()
END
call writefile(lines, 'XSmoothIncsearch', 'D')
let buf = RunVimInTerminal('-S XSmoothIncsearch', #{rows: 8, cols: 40})
+ let g:test_is_flaky = 1
call term_sendkeys(buf, "/b")
- call VerifyScreenDump(buf, 'Test_smooth_incsearch_1', {})
+ call WaitForAssert({-> assert_match('^/b\s*$', term_getline(buf, 8))}, 1000)
+ let view1 = map(range(1, 7), {_, i -> term_getline(buf, i)})
+
call term_sendkeys(buf, "b")
- call VerifyScreenDump(buf, 'Test_smooth_incsearch_2', {})
+ call WaitForAssert({-> assert_match('^/bb\s*$', term_getline(buf, 8))}, 1000)
+ call assert_equal(view1, map(range(1, 7), {_, i -> term_getline(buf, i)}))
+
call term_sendkeys(buf, "b")
- call VerifyScreenDump(buf, 'Test_smooth_incsearch_3', {})
+ call WaitForAssert({-> assert_match('^/bbb\s*$', term_getline(buf, 8))},
1000)
+ call assert_equal(view1, map(range(1, 7), {_, i -> term_getline(buf, i)}))
+
call term_sendkeys(buf, "b")
- call VerifyScreenDump(buf, 'Test_smooth_incsearch_4', {})
+ call WaitForAssert({-> assert_match('^/bbbb\s*$', term_getline(buf, 8))},
1000)
+ call assert_equal(view1, map(range(1, 7), {_, i -> term_getline(buf, i)}))
+
call term_sendkeys(buf, "\<CR>")
call StopVimInTerminal(buf)
diff --git a/src/version.c b/src/version.c
index 376f278c6..95d93bb21 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 */
+/**/
+ 429,
/**/
428,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1wJCI9-002ET8-KM%40256bit.org.
