diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-12 15:51:44 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-12 15:51:44 +0100 |
| commit | 5a6ec52392b78d41153660d0353d5b86a2dc583c (patch) | |
| tree | 9fb7d04b1a75124f992a37f899c40a8ee5469c6d | |
| parent | 1adda3403d80e96446248a92ceafee036053765c (diff) | |
patch 7.4.1543v7.4.1543
Problem: Channel log methods are not tested.
Solution: Log job activity and check it.
| -rw-r--r-- | src/testdir/test_channel.vim | 27 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 29 insertions, 0 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index c9658802d9..c50c1df42c 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 4812298c8a..2eb011484a 100644 --- 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, |