# HG changeset patch # User Christian Brabandt # Date 1455406204 -3600 # Node ID 9f9b74579bdc8c2e16ca7ba02dd21df00db2a45a # Parent 0468a9228c9951307b8db05919213a793330b27e commit https://github.com/vim/vim/commit/0727d362b4dad83d9fdf1caba074213e77e0aa49 Author: Bram Moolenaar Date: Sun Feb 14 00:19:59 2016 +0100 patch 7.4.1317 Problem: MS-Windows: channel test fails. Solution: Temporarily disable Test_connect_waittime(). 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 @@ -252,6 +252,10 @@ endfunc " Test that trying to connect to a non-existing port fails quickly. func Test_connect_waittime() + if !has('unix') + " TODO: Make this work again for MS-Windows. + return + endif let start = reltime() let handle = ch_open('localhost:9876', s:chopt) if ch_status(handle) == "fail" diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1317, +/**/ 1316, /**/ 1315,