From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 12 Mar 2016 12:48:49 +0000 (+0100)
Subject: patch 7.4.1540
X-Git-Tag: v7.4.1540
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac42afd10b96424b89762871905e3e785cdfba3d;p=vim

patch 7.4.1540
Problem:    Channel test is a bit flaky.
Solution:   Increase expected wait time.
---

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 5f2b97f70..a2d41252c 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -442,10 +442,11 @@ func Test_connect_waittime()
       " Oops, port does exists.
       call ch_close(handle)
     else
-      " Failed connection should wait about 500 msec.
+      " Failed connection should wait about 500 msec.  Can be longer if the
+      " computer is busy with other things.
       let elapsed = reltime(start)
       call assert_true(reltimefloat(elapsed) > 0.3)
-      call assert_true(reltimefloat(elapsed) < 1.0)
+      call assert_true(reltimefloat(elapsed) < 1.5)
     endif
   catch
     if v:exception !~ 'Connection reset by peer'
diff --git a/src/version.c b/src/version.c
index 6613b7456..3e802b58f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1540,
 /**/
     1539,
 /**/