summaryrefslogtreecommitdiff
path: root/src/testdir
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-20 21:48:25 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-20 21:48:25 +0100
commitaf7559f66603075e9b4d39d873b2161ea3ec8492 (patch)
tree8c437a5d2bfaa266902821c7498d831a2180281f /src/testdir
parentece61b06ef4726515177c9b293e1c20d2122a73f (diff)
downloadvim-af7559f66603075e9b4d39d873b2161ea3ec8492.zip
patch 7.4.1374
Problem: Channel test hangs on MS-Windows. Solution: Disable the ch_read() that is supposed to time out.
Diffstat (limited to 'src/testdir')
-rw-r--r--src/testdir/test_channel.vim15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 4d3b35914..3d9f6d028 100644
--- 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})