patch 7.4.2260

Problem:    Channel test is flaky.
Solution:   Add a newline to separate JSON messages.

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 964024474b6881d68d721a3cf3b8d2601182bc2a..ee52eef89d514ad8aaf8d5371957b81c74fdfd83 100644 (file)
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -368,11 +368,11 @@ func Ch_raw_one_time_callback(port)
   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 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\"]", {'callback': 'Ch_handleRaw2'})
-  call ch_sendraw(handle, "[3, \"wait a bit\"]", {'callback': 'Ch_handleRaw3'})
+  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

diff --git a/src/version.c b/src/version.c
index c2b66980c53ab1521c0333165fb24318e6293cd8..f29263b47afdb888bacda54439c95ff5f7f52731 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2260,
 /**/
     2259,
 /**/