patch 7.4.1289
Problem: Channel test fails on MS-Windows, connect() takes too long.
Solution: Adjust the test for MS-Windows using "waittime".
diff --git a/src/channel.c b/src/channel.c
index fef6de5..5e4d182 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -468,7 +468,8 @@
#endif
}
- if (errno == ECONNREFUSED)
+ /* Only retry for netbeans. TODO: can we use a waittime instead? */
+ if (errno == ECONNREFUSED && close_cb != NULL)
{
sock_close(sd);
if ((sd = (sock_T)socket(AF_INET, SOCK_STREAM, 0)) == (sock_T)-1)
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index e5903ae..7d82094 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -196,8 +196,8 @@
" Oops, port does exists.
call ch_close(handle)
else
- " Failed connection doesn't wait the full time.
+ " Failed connection doesn't wait the full time on Unix.
let elapsed = reltime(start)
- call assert_true(reltimefloat(elapsed) < 1.0)
+ call assert_true(reltimefloat(elapsed) < (has('unix') ? 1.0 : 3.0))
endif
endfunc
diff --git a/src/version.c b/src/version.c
index 220b2c5..b9ca107 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1289,
+/**/
1288,
/**/
1287,