# HG changeset patch # User Christian Brabandt # Date 1514051105 -3600 # Node ID 318577da90b169118219aa165011deb2936c226c # Parent 396d5f903d26c853b2236f28528ce94e8f56fe40 patch 8.0.1424: the timer_pause test is flaky on Travis commit https://github.com/vim/vim/commit/a47ebdbd222ae488a65be4e8bc3fd87c6301c000 Author: Bram Moolenaar Date: Sat Dec 23 18:41:35 2017 +0100 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 --- 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 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1424, +/**/ 1423, /**/ 1422,