adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 7.4.1374

Browse Source 
Problem:    Channel test hangs on MS-Windows.
Solution:   Disable the ch_read() that is supposed to time out.
This commit is contained in:
Bram Moolenaar
2016-02-20 21:48:25 +01:00
parent ece61b06ef
commit af7559f666
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/testdir/test_channel.vim
View File

@ -185,12 +185,15 @@ func s:communicate(port)
call assert_equal('ok', ch_sendexpr(handle, 'empty-request')) call assert_equal('ok', ch_sendexpr(handle, 'empty-request'))
" Reading while there is nothing available. " Reading while there is nothing available.
call assert_equal(v:none, ch_read(handle, {'timeout': 0})) " TODO: make this work for MS-Windows
let start = reltime() if has('unix')
call assert_equal(v:none, ch_read(handle, {'timeout': 333})) call assert_equal(v:none, ch_read(handle, {'timeout': 0}))
let elapsed = reltime(start) let start = reltime()
call assert_true(reltimefloat(elapsed) > 0.3) call assert_equal(v:none, ch_read(handle, {'timeout': 333}))
call assert_true(reltimefloat(elapsed) < 0.6) let elapsed = reltime(start)
call assert_true(reltimefloat(elapsed) > 0.3)
call assert_true(reltimefloat(elapsed) < 0.6)
endif
" Send without waiting for a response, then wait for a response. " Send without waiting for a response, then wait for a response.
call ch_sendexpr(handle, 'wait a bit', {'callback': 0}) call ch_sendexpr(handle, 'wait a bit', {'callback': 0})

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 */
/**/
1374,
/**/ /**/
1373, 1373,
/**/ /**/