Merge pull request #11740 from Billy4195/fix_jobstop

make jobstop() return 0 instead of throw error for already stopped job
This commit is contained in:
Björn Linse 2020-01-22 19:23:29 +01:00 committed by GitHub
commit 91bd1ddf3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 6 deletions

View File

@ -5502,6 +5502,9 @@ jobstop({id}) *jobstop()*
(if any) will be invoked.
See |job-control|.
Returns 1 for valid job id, 0 for invalid id, including jobs have
exited or stopped.
jobwait({jobs}[, {timeout}]) *jobwait()*
Waits for jobs and their |on_exit| handlers to complete.

View File

@ -12706,7 +12706,7 @@ static void f_jobstop(typval_T *argvars, typval_T *rettv, FunPtr fptr)
return;
}
Channel *data = find_job(argvars[0].vval.v_number, true);
Channel *data = find_job(argvars[0].vval.v_number, false);
if (!data) {
return;
}

View File

@ -306,16 +306,16 @@ describe('jobs', function()
end))
end)
it('disallows jobsend/stop on a non-existent job', function()
it('disallows jobsend on a non-existent job', function()
eq(false, pcall(eval, "jobsend(-1, 'lol')"))
eq(false, pcall(eval, "jobstop(-1)"))
eq(0, eval('jobstop(-1)'))
end)
it('disallows jobstop twice on the same job', function()
it('jobstop twice on the stopped or exited job return 0', function()
nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)")
neq(0, eval('j'))
eq(true, pcall(eval, "jobstop(j)"))
eq(false, pcall(eval, "jobstop(j)"))
eq(1, eval("jobstop(j)"))
eq(0, eval("jobstop(j)"))
end)
it('will not leak memory if we leave a job running', function()
@ -919,6 +919,13 @@ describe('jobs', function()
end)
end)
it('jobstop on same id before stopped', function()
nvim('command', 'let j = jobstart(["cat", "-"], g:job_opts)')
neq(0, eval('j'))
eq({1, 0}, eval('[jobstop(j), jobstop(j)]'))
end)
describe('running tty-test program', function()
if helpers.pending_win32(pending) then return end
local function next_chunk()