patch 8.1.1859: timer test sometimes fails on Mac

Problem:    Timer test sometimes fails on Mac.
Solution:   Show more info when it fails.

diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index e504a89f37e48ef1925f0dfaededb197b9c3258b..dc01d84b855bca8aa5dd0c80ed6908a560541fa4 100644 (file)
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -160,6 +160,7 @@ func StopTimer2(timer)
 endfunc
 
 func Test_timer_stop_in_callback()
+  call assert_equal(0, len(timer_info()))
   let g:timer1 = timer_start(10, 'StopTimer1')
   sleep 40m
   call assert_equal(0, len(timer_info()))
@@ -170,12 +171,18 @@ func StopTimerAll(timer)
 endfunc
 
 func Test_timer_stop_all_in_callback()
-  let g:timer1 = timer_start(10, 'StopTimerAll')
-  let info = timer_info()
-  call assert_equal(1, len(info))
-  sleep 40m
-  let info = timer_info()
-  call assert_equal(0, len(info))
+  call assert_equal(0, len(timer_info()))
+  call timer_start(10, 'StopTimerAll')
+  call assert_equal(1, len(timer_info()))
+  let slept = 0
+  for i in range(10)
+    if len(timer_info()) == 0
+      break
+    endif
+    sleep 10m
+    let slept += 10
+  endfor
+  call assert_inrange(0, 30, slept)
 endfunc
 
 func FeedkeysCb(timer)

diff --git a/src/version.c b/src/version.c
index ee4bb90e5fdf6dc84cc4e695fbf95c5704f92a78..66bd86fc736bb0ccdb2e18bbdbeecb213955b173 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1859,
 /**/
     1858,
 /**/