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.

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index fc8b3729ab3db0e63cc1bc7e625069fff00f320d..a2dafb5600650defacba186d253d461dd3106b27 100644 (file)
--- 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

diff --git a/src/version.c b/src/version.c
index d06b4b7771a27db97db7422d5fb4b1b592a03a73..69afadf0d92808448db4e9e743b28074c4595414 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    475,
 /**/
     474,
 /**/