Mercurial > vim
changeset 9044:5abf6f38cbbb v7.4.1807
commit https://github.com/vim/vim/commit/d75263c020a5044fa73bc8cd57ce73ca5e23b360
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Apr 30 16:07:23 2016 +0200
patch 7.4.1807
Problem: Test_out_close_cb sometimes fails.
Solution: Always write DETACH to out, not err.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 30 Apr 2016 16:15:05 +0200 |
| parents | d5abf78f7d25 |
| children | b905ef2c6adb |
| files | src/channel.c src/testdir/test_channel.vim src/version.c |
| diffstat | 3 files changed, 15 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/channel.c +++ b/src/channel.c @@ -2478,6 +2478,7 @@ channel_close(channel_T *channel, int in * first invoke the close callback. Increment the refcount to avoid * the channel being freed halfway. */ ++channel->ch_refcount; + ch_log(channel, "Invoking callbacks before closing"); for (part = PART_SOCK; part <= PART_ERR; ++part) while (may_invoke_callback(channel, part)) ; @@ -2783,7 +2784,7 @@ channel_close_on_error(channel_T *channe */ if (channel->ch_part[part].ch_mode == MODE_RAW || channel->ch_part[part].ch_mode == MODE_NL) - channel_save(channel, part, (char_u *)DETACH_MSG_RAW, + channel_save(channel, PART_OUT, (char_u *)DETACH_MSG_RAW, (int)STRLEN(DETACH_MSG_RAW), FALSE, "PUT "); /* When reading from stdout is not possible, assume the other side has
--- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -1055,10 +1055,15 @@ func Test_out_close_cb() call ch_log('Test_out_close_cb()') let s:counter = 1 - let s:outmsg = 0 + let s:msg1 = '' + let s:msg2 = '' let s:closemsg = 0 func! OutHandler(chan, msg) - let s:outmsg = s:counter + if s:counter == 1 + let s:msg1 = a:msg + else + let s:msg2 = a:msg + endif let s:counter += 1 endfunc func! CloseHandler(chan) @@ -1070,9 +1075,10 @@ func Test_out_close_cb() \ 'close_cb': 'CloseHandler'}) call assert_equal("run", job_status(job)) try - call s:waitFor('s:closemsg != 0 && s:outmsg != 0') - call assert_equal(1, s:outmsg) - call assert_equal(2, s:closemsg) + call s:waitFor('s:closemsg != 0 && s:msg2 != ""') + call assert_equal('quit', s:msg1) + call assert_equal('DETACH', s:msg2) + call assert_equal(3, s:closemsg) finally call job_stop(job) delfunc OutHandler