aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 7.4.1289

Browse Source 
Problem:    Channel test fails on MS-Windows, connect() takes too long.
Solution:   Adjust the test for MS-Windows using "waittime".
This commit is contained in:
Bram Moolenaar
2016-02-07 22:21:19 +01:00
parent ae8eb3ca92
commit 0fa98e7b85
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/channel.c
View File

@@ -468,7 +468,8 @@ channel_open(char *hostname, int port_in, int waittime, void (*close_cb)(void))
#endif #endif
} }
if (errno == ECONNREFUSED) /* Only retry for netbeans. TODO: can we use a waittime instead? */
if (errno == ECONNREFUSED && close_cb != NULL)
{ {
sock_close(sd); sock_close(sd);
if ((sd = (sock_T)socket(AF_INET, SOCK_STREAM, 0)) == (sock_T)-1) if ((sd = (sock_T)socket(AF_INET, SOCK_STREAM, 0)) == (sock_T)-1)

4
src/testdir/test_channel.vim
View File

@@ -196,8 +196,8 @@ func Test_connect_waittime()
" Oops, port does exists. " Oops, port does exists.
call ch_close(handle) call ch_close(handle)
else else
" Failed connection doesn't wait the full time. " Failed connection doesn't wait the full time on Unix.
let elapsed = reltime(start) let elapsed = reltime(start)
call assert_true(reltimefloat(elapsed) < 1.0) call assert_true(reltimefloat(elapsed) < (has('unix') ? 1.0 : 3.0))
endif endif
endfunc endfunc

2
src/version.c
View File

@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1289,
/**/ /**/
1288, 1288,
/**/ /**/