From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 23 Dec 2017 17:41:35 +0000 (+0100)
Subject: patch 8.0.1424: the timer_pause test is flaky on Travis
X-Git-Tag: v8.0.1424
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a47ebdbd222ae488a65be4e8bc3fd87c6301c000;p=vim

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 c8b25c63b..55f5245f3 100644
--- 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 6b3df0dbf..4f8dfd29c 100644
--- 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,
 /**/