patch 8.2.0048: another timers test is flaky on Travis for Mac

Problem:    Another timers test is flaky on Travis for Mac.
Solution:   Increase maximum expected time.

diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index 78676d211cdd739301399d7bc1008ce88159a636..e0d024b7a6529df1322b2525c100b455da14cf8b 100644 (file)
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -73,7 +73,12 @@ func Test_timer_with_partial_callback()
   let slept = WaitFor('g:val == 1')
   call assert_equal(1, g:val)
   if has('reltime')
-    call assert_inrange(49, 130, slept)
+    " Mac on Travis can be slow.
+    if has('mac')
+      call assert_inrange(49, 180, slept)
+    else
+      call assert_inrange(49, 130, slept)
+    endif
   else
     call assert_inrange(20, 100, slept)
   endif

diff --git a/src/version.c b/src/version.c
index 420c722d240eb856b5d7e33339bbd13304925f8f..0fc35dc834a48cb62004238e6a9056b2d3e9e39b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    48,
 /**/
     47,
 /**/