functests: Replace execute with either command or feed_command

Hope this will make people using feed_command less likely: this hides bugs.
Already found at least two:

1. msgpackparse() will show internal error: hash_add() in case of duplicate
   keys, though it will still work correctly. Currently silenced.
2. ttimeoutlen was spelled incorrectly, resulting in option not being set when
   expected. Test was still functioning somehow though. Currently fixed.
This commit is contained in:
ZyX
2017-04-09 00:12:26 +03:00
parent 9158cc171f
commit 65fb622000
155 changed files with 3174 additions and 3075 deletions

View File

@@ -2,7 +2,7 @@ local helpers = require('test.functional.helpers')(after_each)
local thelpers = require('test.functional.terminal.helpers')
local feed, clear, nvim = helpers.feed, helpers.clear, helpers.nvim
local wait = helpers.wait
local eval, execute, source = helpers.eval, helpers.execute, helpers.source
local eval, feed_command, source = helpers.eval, helpers.feed_command, helpers.source
local eq, neq = helpers.eq, helpers.neq
local write_file = helpers.write_file
@@ -13,7 +13,7 @@ describe('terminal buffer', function()
before_each(function()
clear()
execute('set modifiable swapfile undolevels=20')
feed_command('set modifiable swapfile undolevels=20')
wait()
screen = thelpers.screen_setup()
end)
@@ -86,7 +86,7 @@ describe('terminal buffer', function()
it('sends data to the terminal when the "put" operator is used', function()
feed('<c-\\><c-n>gg"ayj')
execute('let @a = "appended " . @a')
feed_command('let @a = "appended " . @a')
feed('"ap"ap')
screen:expect([[
^tty ready |
@@ -112,8 +112,8 @@ describe('terminal buffer', function()
it('sends data to the terminal when the ":put" command is used', function()
feed('<c-\\><c-n>gg"ayj')
execute('let @a = "appended " . @a')
execute('put a')
feed_command('let @a = "appended " . @a')
feed_command('put a')
screen:expect([[
^tty ready |
appended tty ready |
@@ -124,7 +124,7 @@ describe('terminal buffer', function()
:put a |
]])
-- line argument is only used to move the cursor
execute('6put a')
feed_command('6put a')
screen:expect([[
tty ready |
appended tty ready |
@@ -147,7 +147,7 @@ describe('terminal buffer', function()
{4:~ }|
:bd! |
]])
execute('bnext')
feed_command('bnext')
screen:expect([[
^ |
{4:~ }|
@@ -162,7 +162,7 @@ describe('terminal buffer', function()
it('handles loss of focus gracefully', function()
-- Change the statusline to avoid printing the file name, which varies.
nvim('set_option', 'statusline', '==========')
execute('set laststatus=0')
feed_command('set laststatus=0')
-- Save the buffer number of the terminal for later testing.
local tbuf = eval('bufnr("%")')
@@ -191,16 +191,16 @@ describe('terminal buffer', function()
]])
neq(tbuf, eval('bufnr("%")'))
execute('quit!') -- Should exit the new window, not the terminal.
feed_command('quit!') -- Should exit the new window, not the terminal.
eq(tbuf, eval('bufnr("%")'))
execute('set laststatus=1') -- Restore laststatus to the default.
feed_command('set laststatus=1') -- Restore laststatus to the default.
end)
it('term_close() use-after-free #4393', function()
execute('terminal yes')
feed_command('terminal yes')
feed([[<C-\><C-n>]])
execute('bdelete!')
feed_command('bdelete!')
end)
end)
@@ -217,12 +217,12 @@ describe('No heap-buffer-overflow when using', function()
end)
it('termopen(echo) #3161', function()
execute('edit ' .. testfilename)
feed_command('edit ' .. testfilename)
-- Move cursor away from the beginning of the line
feed('$')
-- Let termopen() modify the buffer
execute('call termopen("echo")')
feed_command('call termopen("echo")')
wait()
execute('bdelete!')
feed_command('bdelete!')
end)
end)