Skip to content

Commit af7559f

Browse files
committed
patch 7.4.1374
Problem: Channel test hangs on MS-Windows. Solution: Disable the ch_read() that is supposed to time out.
1 parent ece61b0 commit af7559f

2 files changed

Lines changed: 11 additions & 6 deletions

File tree

src/testdir/test_channel.vim

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,15 @@ func s:communicate(port)
185185
call assert_equal('ok', ch_sendexpr(handle, 'empty-request'))
186186

187187
" Reading while there is nothing available.
188-
call assert_equal(v:none, ch_read(handle, {'timeout': 0}))
189-
let start = reltime()
190-
call assert_equal(v:none, ch_read(handle, {'timeout': 333}))
191-
let elapsed = reltime(start)
192-
call assert_true(reltimefloat(elapsed) > 0.3)
193-
call assert_true(reltimefloat(elapsed) < 0.6)
188+
" TODO: make this work for MS-Windows
189+
if has('unix')
190+
call assert_equal(v:none, ch_read(handle, {'timeout': 0}))
191+
let start = reltime()
192+
call assert_equal(v:none, ch_read(handle, {'timeout': 333}))
193+
let elapsed = reltime(start)
194+
call assert_true(reltimefloat(elapsed) > 0.3)
195+
call assert_true(reltimefloat(elapsed) < 0.6)
196+
endif
194197

195198
" Send without waiting for a response, then wait for a response.
196199
call ch_sendexpr(handle, 'wait a bit', {'callback': 0})

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,8 @@ static char *(features[]) =
747747

748748
static int included_patches[] =
749749
{ /* Add new patch number below this line */
750+
/**/
751+
1374,
750752
/**/
751753
1373,
752754
/**/

0 commit comments

Comments
 (0)