diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-11-28 21:20:48 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-11-28 21:20:48 +0000 |
| commit | c13e998d4a82e2c90efb4bbc1dd4ea2d6c424592 (patch) | |
| tree | 09462fe2a16d84700aaa86cd9ac1be5c1ce2d63d | |
| parent | 84497cd06f06516f6ce727ea00c47792ce16dc70 (diff) | |
patch 9.0.0968: GUI mouse event test is a bit flakyv9.0.0968
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.
| -rw-r--r-- | src/testdir/test_gui.vim | 21 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 20 insertions, 3 deletions
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index 8ac0985c39..3c7cfb9a0b 100644 --- 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']) - - " place the cursor using left click in normal mode call cursor(1, 1) + redraw! + + " 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("\<Esc>", '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() +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 - " Test invalid parameters for test_gui_event() 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 index 395bb2ad73..f26f91a44a 100644 --- 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, |