To: vim_dev@googlegroups.com
Subject: Patch 7.4.2260
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4.2260 (after 7.4.2258)
Problem:    Channel test is flaky.
Solution:   Add a newline to separate JSON messages.
Files:      src/testdir/test_channel.vim


*** ../vim-7.4.2259/src/testdir/test_channel.vim	2016-08-26 17:58:33.590124381 +0200
--- src/testdir/test_channel.vim	2016-08-26 19:18:53.216816031 +0200
***************
*** 368,378 ****
    call ch_setoptions(handle, {'mode': 'raw'})
  
    " The message are sent raw, we do our own JSON strings here.
!   call ch_sendraw(handle, "[1, \"hello!\"]", {'callback': 'Ch_handleRaw1'})
    call WaitFor('g:Ch_reply1 != ""')
    call assert_equal("[1, \"got it\"]", g:Ch_reply1)
!   call ch_sendraw(handle, "[2, \"echo something\"]", {'callback': 'Ch_handleRaw2'})
!   call ch_sendraw(handle, "[3, \"wait a bit\"]", {'callback': 'Ch_handleRaw3'})
    call WaitFor('g:Ch_reply2 != ""')
    call assert_equal("[2, \"something\"]", g:Ch_reply2)
    " wait for the 200 msec delayed reply
--- 368,378 ----
    call ch_setoptions(handle, {'mode': 'raw'})
  
    " The message are sent raw, we do our own JSON strings here.
!   call ch_sendraw(handle, "[1, \"hello!\"]\n", {'callback': 'Ch_handleRaw1'})
    call WaitFor('g:Ch_reply1 != ""')
    call assert_equal("[1, \"got it\"]", g:Ch_reply1)
!   call ch_sendraw(handle, "[2, \"echo something\"]\n", {'callback': 'Ch_handleRaw2'})
!   call ch_sendraw(handle, "[3, \"wait a bit\"]\n", {'callback': 'Ch_handleRaw3'})
    call WaitFor('g:Ch_reply2 != ""')
    call assert_equal("[2, \"something\"]", g:Ch_reply2)
    " wait for the 200 msec delayed reply
*** ../vim-7.4.2259/src/version.c	2016-08-26 19:13:02.119896996 +0200
--- src/version.c	2016-08-26 19:19:40.088405172 +0200
***************
*** 765,766 ****
--- 765,768 ----
  {   /* Add new patch number below this line */
+ /**/
+     2260,
  /**/

-- 
From "know your smileys":
 :----}  You lie like Pinocchio

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///