To: vim_dev@googlegroups.com Subject: Patch 9.0.1592 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.1592 Problem: Not all timer tests are marked as flaky. Solution: Set the flaky flag for all timer tests. (closes #12355) Files: src/testdir/test_timers.vim *** ../vim-9.0.1591/src/testdir/test_timers.vim 2023-01-28 19:18:56.737720609 +0000 --- src/testdir/test_timers.vim 2023-05-30 15:32:18.335265618 +0100 *************** *** 7,12 **** --- 7,17 ---- 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 *************** *** 16,22 **** 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') --- 21,26 ---- *************** *** 35,41 **** 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') --- 39,44 ---- *************** *** 53,59 **** 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 --- 56,61 ---- *************** *** 67,73 **** endfunc func Test_timer_with_partial_callback() - let g:test_is_flaky = 1 let g:val = 0 let meow = {'one': 1} function meow.bite(...) --- 69,74 ---- *************** *** 152,158 **** enddef func Test_timer_paused() - let g:test_is_flaky = 1 let g:val = 0 let id = timer_start(50, 'MyHandler') --- 153,158 ---- *************** *** 212,218 **** 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 --- 212,217 ---- *************** *** 236,242 **** 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') --- 235,240 ---- *** ../vim-9.0.1591/src/version.c 2023-05-29 19:59:38.217805411 +0100 --- src/version.c 2023-05-30 15:33:23.646977950 +0100 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 1592, /**/ -- From "know your smileys": =):-) Uncle Sam /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///