thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0475: channel out_cb test still fails sometimes on Mac

Browse Source 
Problem:    Channel out_cb test still fails sometimes on Mac.
Solution:   Use an ever longer timeout.
This commit is contained in:
Bram Moolenaar
2020-03-29 16:18:58 +02:00
parent 0fff44152d
commit bf54dbeb5c
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/testdir/test_channel.vim
View File

@@ -1174,8 +1174,13 @@ func Test_out_cb()
" Receive a json object split in pieces " Receive a json object split in pieces
let g:Ch_outobj = '' let g:Ch_outobj = ''
call ch_sendraw(job, "echosplit [0, {\"one\": 1,| \"tw|o\": 2, \"three\": 3|}]\n") call ch_sendraw(job, "echosplit [0, {\"one\": 1,| \"tw|o\": 2, \"three\": 3|}]\n")
" For unknown reason this can be very slow on Mac. " For unknown reasons this can be very slow on Mac.
call WaitForAssert({-> assert_equal({'one': 1, 'two': 2, 'three': 3}, g:Ch_outobj)}, 10000) if has('mac')
let timeout = 20000
else
let timeout = 5000
endif
call WaitForAssert({-> assert_equal({'one': 1, 'two': 2, 'three': 3}, g:Ch_outobj)}, timeout)
finally finally
call job_stop(job) call job_stop(job)
endtry endtry

2
src/version.c
View File

@@ -738,6 +738,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 */
/**/
475,
/**/ /**/
474, 474,
/**/ /**/