diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-12-17 11:44:33 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-12-17 11:44:33 +0000 |
| commit | deda6441e457072df39cdc8744dcd685d77fa273 (patch) | |
| tree | 815afc68a34e8a5d2c18dd9ece889de455567065 | |
| parent | c3f91c0648f4b04a6a9ceb4ccec45ea767a63796 (diff) | |
| download | vim-git-deda6441e457072df39cdc8744dcd685d77fa273.tar.gz | |
patch 8.2.3834: Test_out_cb often fails on Macv8.2.3834
Problem: Test_out_cb often fails on Mac.
Solution: Increase the timeout with every retry.
| -rw-r--r-- | src/testdir/test_channel.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index f8cdef4fc..d9ab521f8 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -1239,10 +1239,15 @@ func Test_out_cb() 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') + " 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 = 5000 + let timeout = 40000 endif call WaitForAssert({-> assert_equal({'one': 1, 'two': 2, 'three': 3}, g:Ch_outobj)}, timeout) finally diff --git a/src/version.c b/src/version.c index b2f02eca5..368384c9a 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3834, +/**/ 3833, /**/ 3832, |