# HG changeset patch # User Bram Moolenaar # Date 1669671003 -3600 # Node ID b2a11acd21700b720db92714df4dd36cb3518c5c # Parent 5dc17033ec35f2d24892b5303ed1f184cfc4e1de patch 9.0.0968: GUI mouse event test is a bit flaky Commit: https://github.com/vim/vim/commit/c13e998d4a82e2c90efb4bbc1dd4ea2d6c424592 Author: Bram Moolenaar Date: Mon Nov 28 21:20:48 2022 +0000 patch 9.0.0968: GUI mouse event test is a bit flaky Problem: GUI mouse event test is a bit flaky. Solution: Mark the test case as flaky. Move test function failure checks to a separate test function. diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim --- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -904,13 +904,17 @@ endfunc " Test GUI mouse events func Test_gui_mouse_event() + " Low level input isn't 100% reliable + let g:test_is_flaky = 1 + set mousemodel=extend call test_override('no_query_mouse', 1) new call setline(1, ['one two three', 'four five six']) + call cursor(1, 1) + redraw! - " place the cursor using left click in normal mode - call cursor(1, 1) + " place the cursor using left click and release in normal mode let args = #{button: 0, row: 2, col: 4, multiclick: 0, modifiers: 0} call test_gui_event('mouse', args) let args.button = 3 @@ -1175,10 +1179,21 @@ func Test_gui_mouse_event() call feedkeys("\", 'Lx!') call assert_equal([0, 2, 7, 0], getpos('.')) call assert_equal('wo thrfour five sixteen', getline(2)) + set mouse& let &guioptions = save_guioptions + bw! + call test_override('no_query_mouse', 0) + set mousemodel& +endfunc - " Test invalid parameters for test_gui_event() +" Test invalid parameters for test_gui_event() +func Test_gui_event_mouse_fails() + call test_override('no_query_mouse', 1) + new + call setline(1, ['one two three', 'four five six']) + set mousemodel=extend + let args = #{row: 2, col: 4, multiclick: 0, modifiers: 0} call assert_false(test_gui_event('mouse', args)) let args = #{button: 0, col: 4, multiclick: 0, modifiers: 0} diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 968, +/**/ 967, /**/ 966,