diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-04-30 16:07:23 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-04-30 16:07:23 +0200 |
| commit | d75263c020a5044fa73bc8cd57ce73ca5e23b360 (patch) | |
| tree | 90c14b44f93abba7f154da456f03a5b991fa2a41 | |
| parent | 8e3d1b6326c103cc92f8d07b1161ee5172acf201 (diff) | |
patch 7.4.1807v7.4.1807
Problem: Test_out_close_cb sometimes fails.
Solution: Always write DETACH to out, not err.
| -rw-r--r-- | src/channel.c | 3 | ||||
| -rw-r--r-- | src/testdir/test_channel.vim | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 6 deletions
diff --git a/src/channel.c b/src/channel.c index 1be3d27ffe..aa588031c1 100644 --- a/src/channel.c +++ b/src/channel.c @@ -2478,6 +2478,7 @@ channel_close(channel_T *channel, int invoke_close_cb) * 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 *channel, int part, char *func) */ 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 diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 6eb3c1f04f..702fa0cbbe 100644 --- 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 diff --git a/src/version.c b/src/version.c index 7c05b284c7..f0463d49d3 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1807, +/**/ 1806, /**/ 1805, |