mirror of
https://github.com/neovim/neovim.git
synced 2025-09-23 11:38:31 +00:00
test/terminal: Cover race when :term shell process exits.
References #5445 See https://github.com/neovim/neovim/pull/5445#issuecomment-252529766
This commit is contained in:
@@ -366,10 +366,10 @@ void terminal_resize(Terminal *term, uint16_t width, uint16_t height)
|
|||||||
void terminal_enter(void)
|
void terminal_enter(void)
|
||||||
{
|
{
|
||||||
buf_T *buf = curbuf;
|
buf_T *buf = curbuf;
|
||||||
|
assert(buf->terminal); // Should only be called when curbuf has a terminal.
|
||||||
TerminalState state, *s = &state;
|
TerminalState state, *s = &state;
|
||||||
memset(s, 0, sizeof(TerminalState));
|
memset(s, 0, sizeof(TerminalState));
|
||||||
s->term = buf->terminal;
|
s->term = buf->terminal;
|
||||||
assert(s->term && "should only be called when curbuf has a terminal");
|
|
||||||
|
|
||||||
// Ensure the terminal is properly sized.
|
// Ensure the terminal is properly sized.
|
||||||
terminal_resize(s->term, 0, 0);
|
terminal_resize(s->term, 0, 0);
|
||||||
|
@@ -13,13 +13,19 @@ describe(':terminal', function()
|
|||||||
clear()
|
clear()
|
||||||
screen = Screen.new(50, 4)
|
screen = Screen.new(50, 4)
|
||||||
screen:attach({rgb=false})
|
screen:attach({rgb=false})
|
||||||
|
-- shell-test.c is a fake shell that prints its arguments and exits.
|
||||||
nvim('set_option', 'shell', nvim_dir..'/shell-test')
|
nvim('set_option', 'shell', nvim_dir..'/shell-test')
|
||||||
nvim('set_option', 'shellcmdflag', 'EXE')
|
nvim('set_option', 'shellcmdflag', 'EXE')
|
||||||
|
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
-- Invokes `:terminal {cmd}` using a fake shell (shell-test.c) which prints
|
||||||
|
-- the {cmd} and exits immediately .
|
||||||
|
local function terminal_run_fake_shell_cmd(cmd)
|
||||||
|
execute("terminal "..(cmd and cmd or ""))
|
||||||
|
end
|
||||||
|
|
||||||
it('with no argument, acts like termopen()', function()
|
it('with no argument, acts like termopen()', function()
|
||||||
execute('terminal')
|
terminal_run_fake_shell_cmd()
|
||||||
wait()
|
wait()
|
||||||
screen:expect([[
|
screen:expect([[
|
||||||
ready $ |
|
ready $ |
|
||||||
@@ -30,7 +36,7 @@ describe(':terminal', function()
|
|||||||
end)
|
end)
|
||||||
|
|
||||||
it('executes a given command through the shell', function()
|
it('executes a given command through the shell', function()
|
||||||
execute('terminal echo hi')
|
terminal_run_fake_shell_cmd('echo hi')
|
||||||
wait()
|
wait()
|
||||||
screen:expect([[
|
screen:expect([[
|
||||||
ready $ echo hi |
|
ready $ echo hi |
|
||||||
@@ -41,7 +47,7 @@ describe(':terminal', function()
|
|||||||
end)
|
end)
|
||||||
|
|
||||||
it('allows quotes and slashes', function()
|
it('allows quotes and slashes', function()
|
||||||
execute([[terminal echo 'hello' \ "world"]])
|
terminal_run_fake_shell_cmd([[echo 'hello' \ "world"]])
|
||||||
wait()
|
wait()
|
||||||
screen:expect([[
|
screen:expect([[
|
||||||
ready $ echo 'hello' \ "world" |
|
ready $ echo 'hello' \ "world" |
|
||||||
@@ -58,4 +64,16 @@ describe(':terminal', function()
|
|||||||
-- Verify that BufNew actually fired (else the test is invalid).
|
-- Verify that BufNew actually fired (else the test is invalid).
|
||||||
eq('foo', eval('&shell'))
|
eq('foo', eval('&shell'))
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
it('ignores writes if the backing stream closes', function()
|
||||||
|
terminal_run_fake_shell_cmd()
|
||||||
|
helpers.feed('iiXXXXXXX')
|
||||||
|
wait()
|
||||||
|
-- Race: Though the shell exited (and streams were closed by SIGCHLD
|
||||||
|
-- handler), :terminal cleanup is pending on the main-loop.
|
||||||
|
-- This write should be ignored (not crash, #5445).
|
||||||
|
helpers.feed('iiYYYYYYY')
|
||||||
|
wait()
|
||||||
|
end)
|
||||||
|
|
||||||
end)
|
end)
|
||||||
|
Reference in New Issue
Block a user