Mercurial > vim
changeset 8161:e9caba58213b v7.4.1374
commit https://github.com/vim/vim/commit/af7559f66603075e9b4d39d873b2161ea3ec8492
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Feb 20 21:48:25 2016 +0100
patch 7.4.1374
Problem: Channel test hangs on MS-Windows.
Solution: Disable the ch_read() that is supposed to time out.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 20 Feb 2016 22:00:04 +0100 |
| parents | d0d693547f5a |
| children | 75020792758c |
| files | src/testdir/test_channel.vim src/version.c |
| diffstat | 2 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -185,12 +185,15 @@ func s:communicate(port) call assert_equal('ok', ch_sendexpr(handle, 'empty-request')) " Reading while there is nothing available. - call assert_equal(v:none, ch_read(handle, {'timeout': 0})) - let start = reltime() - call assert_equal(v:none, ch_read(handle, {'timeout': 333})) - let elapsed = reltime(start) - call assert_true(reltimefloat(elapsed) > 0.3) - call assert_true(reltimefloat(elapsed) < 0.6) + " TODO: make this work for MS-Windows + if has('unix') + call assert_equal(v:none, ch_read(handle, {'timeout': 0})) + let start = reltime() + call assert_equal(v:none, ch_read(handle, {'timeout': 333})) + 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. call ch_sendexpr(handle, 'wait a bit', {'callback': 0})