patch 8.0.1424: the timer_pause test is flaky on Travis

Problem:    The timer_pause test is flaky on Travis.
Solution:   Accept a longer sleep time on Mac.

diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index c8b25c63b5d854fb2a04f3ed3ac5d3a242a660e7..55f5245f3c2debe5d56881767c4def7b6a5e3e53 100644 (file)
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -122,7 +122,12 @@ func Test_paused()
   let slept = WaitFor('g:val == 1')
   call assert_equal(1, g:val)
   if has('reltime')
-    call assert_inrange(0, 30, slept)
+    if has('mac')
+      " The travis Mac machines appear to be very busy.
+      call assert_inrange(0, 40, slept)
+    else
+      call assert_inrange(0, 30, slept)
+    endif
   else
     call assert_inrange(0, 10, slept)
   endif

diff --git a/src/version.c b/src/version.c
index 6b3df0dbfd9b299855ce582c74de3065371a11a0..4f8dfd29c02d426768af50e9562021c322c30bbe 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1424,
 /**/
     1423,
 /**/