From a47ebdbd222ae488a65be4e8bc3fd87c6301c000 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 23 Dec 2017 18:41:35 +0100 Subject: [PATCH] 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. --- src/testdir/test_timers.vim | 7 ++++++- src/version.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim index c8b25c63b5..55f5245f3c 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 6b3df0dbfd..4f8dfd29c0 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, /**/