diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-08-17 13:18:16 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-08-17 13:18:16 +0200 |
| commit | 315244d85b9b8faae549b1700e8cc2e45eaa68ea (patch) | |
| tree | 29da5a073f5d3199770b208d717411698ae07ce5 /src | |
| parent | d5cf89872e6185c4d97cd254a9d697b8c3bdbf94 (diff) | |
patch 8.1.1867: still a timer test that is flaky on Macv8.1.1867
Problem: Still a timer test that is flaky on Mac.
Solution: Loop with a sleep instead of one fixed sleep.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_timers.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim index f40213ddda..3eebad66c3 100644 --- a/src/testdir/test_timers.vim +++ b/src/testdir/test_timers.vim @@ -162,8 +162,16 @@ endfunc func Test_timer_stop_in_callback() call assert_equal(0, len(timer_info())) let g:timer1 = timer_start(10, 'StopTimer1') - sleep 50m - call assert_equal(0, len(timer_info())) + let slept = 0 + for i in range(10) + if len(timer_info()) == 0 + break + endif + sleep 10m + let slept += 10 + endfor + " This should take only 30 msec, but on Mac it's often longer + call assert_inrange(0, 50, slept) endfunc func StopTimerAll(timer) diff --git a/src/version.c b/src/version.c index 4b3637c47a..a885d9e416 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1867, +/**/ 1866, /**/ 1865, |