To: vim_dev@googlegroups.com Subject: Patch 8.2.0475 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0475 Problem: Channel out_cb test still fails sometimes on Mac. Solution: Use an ever longer timeout. Files: src/testdir/test_channel.vim *** ../vim-8.2.0474/src/testdir/test_channel.vim 2020-03-26 16:27:34.942445362 +0100 --- src/testdir/test_channel.vim 2020-03-29 16:17:25.734761640 +0200 *************** *** 1174,1181 **** " 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) finally call job_stop(job) endtry --- 1174,1186 ---- " 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 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 *** ../vim-8.2.0474/src/version.c 2020-03-29 16:06:25.477382704 +0200 --- src/version.c 2020-03-29 16:18:28.402524232 +0200 *************** *** 740,741 **** --- 740,743 ---- { /* Add new patch number below this line */ + /**/ + 475, /**/ -- ARTHUR: Listen, old crone! Unless you tell us where we can buy a shrubbery, my friend and I will ... we will say "Ni!" CRONE: Do your worst! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///