From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 12 Mar 2016 14:51:44 +0000 (+0100)
Subject: patch 7.4.1543
X-Git-Tag: v7.4.1543
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a6ec52392b78d41153660d0353d5b86a2dc583c;p=vim

patch 7.4.1543
Problem:    Channel log methods are not tested.
Solution:   Log job activity and check it.
---

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index c9658802d..c50c1df42 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -517,6 +517,7 @@ func Test_nl_err_to_out_pipe()
   if !has('job')
     return
   endif
+  call ch_logfile('Xlog')
   call ch_log('Test_nl_err_to_out_pipe()')
   let job = job_start(s:python . " test_channel_pipe.py", {'err-io': 'out'})
   call assert_equal("run", job_status(job))
@@ -529,6 +530,32 @@ func Test_nl_err_to_out_pipe()
     call assert_equal("wrong", ch_readraw(handle))
   finally
     call job_stop(job)
+    call ch_logfile('')
+    let loglines = readfile('Xlog')
+    call assert_true(len(loglines) > 10)
+    let found_test = 0
+    let found_send = 0
+    let found_recv = 0
+    let found_stop = 0
+    for l in loglines
+      if l =~ 'Test_nl_err_to_out_pipe'
+	let found_test = 1
+      endif
+      if l =~ 'SEND on.*echo something'
+	let found_send = 1
+      endif
+      if l =~ 'RECV on.*something'
+	let found_recv = 1
+      endif
+      if l =~ 'Stopping job with'
+	let found_stop = 1
+      endif
+    endfor
+    call assert_equal(1, found_test)
+    call assert_equal(1, found_send)
+    call assert_equal(1, found_recv)
+    call assert_equal(1, found_stop)
+    call delete('Xlog')
   endtry
 endfunc
 
diff --git a/src/version.c b/src/version.c
index 4812298c8..2eb011484 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1543,
 /**/
     1542,
 /**/