# HG changeset patch # User Christian Brabandt # Date 1457794804 -3600 # Node ID c93c352717b3a4700d95457babcf6f70a48d8e54 # Parent abb7353dd6cd8831d8da94baf796c8eb91e28901 commit https://github.com/vim/vim/commit/5a6ec52392b78d41153660d0353d5b86a2dc583c Author: Bram Moolenaar Date: Sat Mar 12 15:51:44 2016 +0100 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 --- 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 --- a/src/version.c +++ b/src/version.c @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1543, +/**/ 1542, /**/ 1541,