Mercurial > vim
changeset 8746:4c38a4733578 v7.4.1662
commit https://github.com/vim/vim/commit/c4dcd60c76666bf113719f929709ad6120eb6528
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 26 22:56:46 2016 +0100
patch 7.4.1662
Problem: No test for an invalid Ex command on a channel.
Solution: Test handling an invalid command gracefully. Avoid getting an
error message, do write it to the channel log.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 26 Mar 2016 23:00:05 +0100 |
| parents | bafdb038f07a |
| children | fd9a1d2cc956 |
| files | src/channel.c src/testdir/test_channel.py src/testdir/test_channel.vim src/version.c |
| diffstat | 4 files changed, 21 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/channel.c +++ b/src/channel.c @@ -1661,8 +1661,17 @@ channel_exe_cmd(channel_T *channel, int if (STRCMP(cmd, "ex") == 0) { + int save_called_emsg = called_emsg; + + called_emsg = FALSE; ch_logs(channel, "Executing ex command '%s'", (char *)arg); + ++emsg_silent; do_cmdline_cmd(arg); + --emsg_silent; + if (called_emsg) + ch_logs(channel, "Ex command error: '%s'", + (char *)get_vim_var_str(VV_ERRMSG)); + called_emsg = save_called_emsg; } else if (STRCMP(cmd, "normal") == 0) {
--- a/src/testdir/test_channel.py +++ b/src/testdir/test_channel.py @@ -73,6 +73,11 @@ class ThreadedTCPRequestHandler(socketse print("sending: {0}".format(cmd)) self.request.sendall(cmd.encode('utf-8')) response = "ok" + elif decoded[1] == 'bad command': + cmd = '["ex","foo bar"]' + print("sending: {0}".format(cmd)) + self.request.sendall(cmd.encode('utf-8')) + response = "ok" elif decoded[1] == 'do normal': # Send a normal command. cmd = '["normal","G$s more\u001b"]'
--- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -151,6 +151,11 @@ func s:communicate(port) call assert_equal('added1', getline(line('$') - 1)) call assert_equal('added2', getline('$')) + " Request command "foo bar", which fails silently. + call assert_equal('ok', ch_evalexpr(handle, 'bad command')) + call s:waitFor('v:errmsg =~ "E492"') + call assert_true(v:errmsg =~ 'E492:.*foo bar') + call assert_equal('ok', ch_evalexpr(handle, 'do normal', {'timeout': 100})) call s:waitFor('"added more" == getline("$")') call assert_equal('added more', getline('$'))