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 5f2b97f70fe4df723e0e0b199885618f5ee0fadb..a2d41252c3270f0bfdca10c8490f610ccf1ebc4d 100644 (file)
--- 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 6613b7456bc553965c7fcef615bb4cd0d129b1d7..3e802b58f11c54cc1dd746796335c4ee898b6a8a 100644 (file)
--- 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,
 /**/