To: vim_dev@googlegroups.com Subject: Patch 8.2.3834 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3834 Problem: Test_out_cb often fails on Mac. Solution: Increase the timeout with every retry. Files: src/testdir/test_channel.vim *** ../vim-8.2.3833/src/testdir/test_channel.vim 2021-10-16 13:00:10.940165406 +0100 --- src/testdir/test_channel.vim 2021-12-17 11:39:29.305006322 +0000 *************** *** 1239,1248 **** 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 --- 1239,1253 ---- 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. ! " Increase the timeout on every run. ! if g:run_nr == 1 ! let timeout = 5000 ! elseif g:run_nr == 2 ! let timeout = 10000 ! elseif g:run_nr == 3 let timeout = 20000 else ! let timeout = 40000 endif call WaitForAssert({-> assert_equal({'one': 1, 'two': 2, 'three': 3}, g:Ch_outobj)}, timeout) finally *** ../vim-8.2.3833/src/version.c 2021-12-17 09:44:29.143056549 +0000 --- src/version.c 2021-12-17 11:42:04.036699703 +0000 *************** *** 751,752 **** --- 751,754 ---- { /* Add new patch number below this line */ + /**/ + 3834, /**/ -- hundred-and-one symptoms of being an internet addict: 51. You put a pillow case over your laptop so your lover doesn't see it while you are pretending to catch your breath. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///