Skip to content

Commit

Permalink
patch 9.0.1592: not all timer tests are marked as flaky
Browse files Browse the repository at this point in the history
Problem:    Not all timer tests are marked as flaky.
Solution:   Set the flaky flag for all timer tests. (closes #12355)
  • Loading branch information
brammool committed May 30, 2023
1 parent c9fbd25 commit 29b4c51
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 5 additions & 7 deletions src/testdir/test_timers.vim
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ source screendump.vim
source shared.vim
source term_util.vim

func SetUp()
" The tests here use timers, thus are sensitive to timing.
let g:test_is_flaky = 1
endfunc

func MyHandler(timer)
let g:val += 1
endfunc
Expand All @@ -16,7 +21,6 @@ func MyHandlerWithLists(lists, timer)
endfunc

func Test_timer_oneshot()
let g:test_is_flaky = 1
let g:val = 0
let timer = timer_start(50, 'MyHandler')
let slept = WaitFor('g:val == 1')
Expand All @@ -35,7 +39,6 @@ func Test_timer_oneshot()
endfunc

func Test_timer_repeat_three()
let g:test_is_flaky = 1
let g:val = 0
let timer = timer_start(50, 'MyHandler', {'repeat': 3})
let slept = WaitFor('g:val == 3')
Expand All @@ -53,7 +56,6 @@ func Test_timer_repeat_three()
endfunc

func Test_timer_repeat_many()
let g:test_is_flaky = 1
let g:val = 0
let timer = timer_start(50, 'MyHandler', {'repeat': -1})
sleep 200m
Expand All @@ -67,7 +69,6 @@ func Test_timer_repeat_many()
endfunc

func Test_timer_with_partial_callback()
let g:test_is_flaky = 1
let g:val = 0
let meow = {'one': 1}
function meow.bite(...)
Expand Down Expand Up @@ -152,7 +153,6 @@ def Test_timer_stopall_with_popup()
enddef

func Test_timer_paused()
let g:test_is_flaky = 1
let g:val = 0

let id = timer_start(50, 'MyHandler')
Expand Down Expand Up @@ -212,7 +212,6 @@ func StopTimer2(timer)
endfunc

func Test_timer_stop_in_callback()
let g:test_is_flaky = 1
call assert_equal(1, len(timer_info()))
let g:timer1 = timer_start(10, 'StopTimer1')
let slept = 0
Expand All @@ -236,7 +235,6 @@ func StopTimerAll(timer)
endfunc

func Test_timer_stop_all_in_callback()
let g:test_is_flaky = 1
" One timer is for TestTimeout()
call assert_equal(1, len(timer_info()))
call timer_start(10, 'StopTimerAll')
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1592,
/**/
1591,
/**/
Expand Down

0 comments on commit 29b4c51

Please sign in to comment.