# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1457787605 -3600
# Node ID 1227dc21865b3cf46f228e46816ae319290ad0bb
# Parent  10606ea16a0b1fb6510ae2d2c2283fbc82a2c270
commit https://github.com/vim/vim/commit/ac42afd10b96424b89762871905e3e785cdfba3d
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Mar 12 13:48:49 2016 +0100

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1540,
+/**/
     1539,
 /**/
     1538,