[vim] 125/139: patch 7.4.1807 Problem: Test_out_close_cb sometimes fails. Solution: Always write DETACH to out, not err.

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit d75263c020a5044fa73bc8cd57ce73ca5e23b360
Author: Bram Moolenaar <Bram at 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.
---
 src/channel.c                |  3 ++-
 src/testdir/test_channel.vim | 16 +++++++++++-----
 src/version.c                |  2 ++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/channel.c b/src/channel.c
index 1be3d27..aa58803 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 6eb3c1f..702fa0c 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 7c05b28..f0463d4 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,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git