changeset 19838:4403ab355d5e v8.2.0475

patch 8.2.0475: channel out_cb test still fails sometimes on Mac Commit: https://github.com/vim/vim/commit/bf54dbeb5ccd2cfb9cc0687fd71ac3b3eddce0da Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 29 16:18:58 2020 +0200 patch 8.2.0475: channel out_cb test still fails sometimes on Mac Problem: Channel out_cb test still fails sometimes on Mac. Solution: Use an ever longer timeout.
author Bram Moolenaar <Bram@vim.org>
date Sun, 29 Mar 2020 16:30:04 +0200
parents 6af6b0aa19a7
children 95aa315cc31d
files src/testdir/test_channel.vim src/version.c
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1174,8 +1174,13 @@ func Test_out_cb()
     " Receive a json object split in pieces
     let g:Ch_outobj = ''
     call ch_sendraw(job, "echosplit [0, {\"one\": 1,| \"tw|o\": 2, \"three\": 3|}]\n")
-    " For unknown reason this can be very slow on Mac.
-    call WaitForAssert({-> assert_equal({'one': 1, 'two': 2, 'three': 3}, g:Ch_outobj)}, 10000)
+    " For unknown reasons this can be very slow on Mac.
+    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
     call job_stop(job)
   endtry
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    475,
+/**/
     474,
 /**/
     473,