mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-24 08:15:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #10783 from erw7/debug-job-spec

Browse Source 
fix #10762 flaky 'jobstop() kills entire process tree #6530'
This commit is contained in:
Justin M. Keyes
2019-08-16 10:10:10 +02:00
committed by GitHub
parent 1852dfdf9a 85edb33fd1
commit 812ed53724
1 changed files with 67 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
test/functional/core/job_spec.lua
View File

@@ -768,16 +768,79 @@ describe('jobs', function()
-- ..c.."', '-c', '"..c.."'])")
-- Create child with several descendants.
if iswin() then
source([[
function! s:formatprocs(pid, prefix)
let result = ''
let result .= a:prefix . printf("%-24.24s%6s %12.12s %s\n",
\ s:procs[a:pid]['name'],
\ a:pid,
\ s:procs[a:pid]['Session Name'],
\ s:procs[a:pid]['Session'])
if has_key(s:procs[a:pid], 'children')
for pid in s:procs[a:pid]['children']
let result .= s:formatprocs(pid, a:prefix . ' ')
endfor
endif
return result
endfunction
function! PsTree() abort
let s:procs = {}
for proc in map(
\ map(
\ systemlist('tasklist /NH'),
\ 'substitute(v:val, "\r", "", "")'),
\ 'split(v:val, "\\s\\+")')
if len(proc) == 6
let s:procs[proc[1]] ..']]'..[[= {'name': proc[0],
\ 'Session Name': proc[2],
\ 'Session': proc[3]}
endif
endfor
for pid in keys(s:procs)
let children = nvim_get_proc_children(str2nr(pid))
if !empty(children)
let s:procs[pid]['children'] = children
for cpid in children
let s:procs[printf('%d', cpid)]['parent'] = str2nr(pid)
endfor
endif
endfor
let result = ''
for pid in sort(keys(s:procs), {i1, i2 -> i1 - i2})
if !has_key(s:procs[pid], 'parent')
let result .= s:formatprocs(pid, '')
endif
endfor
return result
endfunction
]])
end
local sleep_cmd = (iswin()
and 'ping -n 31 127.0.0.1'
or 'sleep 30')
local j = eval("jobstart('"..sleep_cmd..' | '..sleep_cmd..' | '..sleep_cmd.."')")
local ppid = funcs.jobpid(j)
local children
retry(nil, nil, function()
children = meths.get_proc_children(ppid)
eq((iswin() and 4 or 3), #children)
end)
if iswin() then
local status, result = pcall(retry, nil, nil, function()
children = meths.get_proc_children(ppid)
-- On Windows conhost.exe may exist, and
-- e.g. vctip.exe might appear. #10783
ok(#children >= 3 and #children <= 5)
end)
if not status then
print('')
print(eval('PsTree()'))
error(result)
end
else
retry(nil, nil, function()
children = meths.get_proc_children(ppid)
eq(3, #children)
end)
end
-- Assert that nvim_get_proc() sees the children.
for _, child_pid in ipairs(children) do
local info = meths.get_proc(child_pid)