From 24078e39cd10b8a65af5297ebe12ddf1e550167a Mon Sep 17 00:00:00 2001 From: Yee Cheng Chin Date: Tue, 12 Nov 2024 20:26:48 +0100 Subject: [PATCH] patch 9.1.0860: tests: mouse_shape tests use hard code sleep value Problem: tests: mouse_shape tests use hard code sleep value (Bram Moolenaar) Solution: Use WaitForAssert() instead (Yee Cheng Chin) related: #12157 closes: #16042 Signed-off-by: Yee Cheng Chin Signed-off-by: Christian Brabandt --- src/testdir/test_normal.vim | 6 ++---- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim index 32050ced96..6dd3fac0cd 100644 --- a/src/testdir/test_normal.vim +++ b/src/testdir/test_normal.vim @@ -3948,8 +3948,7 @@ func Test_mouse_shape_after_failed_change() END call writefile(lines, 'Xmouseshape.vim', 'D') call RunVim([], [], "-g -S Xmouseshape.vim") - sleep 300m - call assert_equal(['busy', 'arrow'], readfile('Xmouseshapes')) + call WaitForAssert({-> assert_equal(['busy', 'arrow'], readfile('Xmouseshapes'))}, 300) call delete('Xmouseshapes') endfunc @@ -3980,8 +3979,7 @@ func Test_mouse_shape_after_cancelling_gr() END call writefile(lines, 'Xmouseshape.vim', 'D') call RunVim([], [], "-g -S Xmouseshape.vim") - sleep 300m - call assert_equal(['beam', 'arrow'], readfile('Xmouseshapes')) + call WaitForAssert({-> assert_equal(['beam', 'arrow'], readfile('Xmouseshapes'))}, 300) call delete('Xmouseshapes') endfunc diff --git a/src/version.c b/src/version.c index 8c2533c575..7985985689 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 860, /**/ 859, /**/