diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2025-02-11 07:19:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-11 07:19:46 -0800 |
| commit | ac768996b295fe58256444a258911ec0fb9adc3f (patch) | |
| tree | a53e0c75184a605785dd8c1ee16f3278edd4ad41 /test/functional/core | |
| parent | 891d2f4029259b2790b9aa3ca71ebca0ff3d7eba (diff) | |
| download | rneovim-ac768996b295fe58256444a258911ec0fb9adc3f.tar.gz rneovim-ac768996b295fe58256444a258911ec0fb9adc3f.tar.bz2 rneovim-ac768996b295fe58256444a258911ec0fb9adc3f.zip | |
refactor(tests): drop os_kill #32401
Also change job tests to use `nvim` instead of random programs like `ping`.
Diffstat (limited to 'test/functional/core')
| -rw-r--r-- | test/functional/core/job_spec.lua | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/test/functional/core/job_spec.lua b/test/functional/core/job_spec.lua index 75e09f3455..7a50993171 100644 --- a/test/functional/core/job_spec.lua +++ b/test/functional/core/job_spec.lua @@ -21,7 +21,6 @@ local rmdir = n.rmdir local assert_alive = n.assert_alive local command = n.command local fn = n.fn -local os_kill = n.os_kill local retry = t.retry local api = n.api local NIL = vim.NIL @@ -444,27 +443,23 @@ describe('jobs', function() end) it('disposed on Nvim exit', function() - -- use sleep, which doesn't die on stdin close - command( - "let g:j = jobstart(has('win32') ? ['ping', '-n', '1001', '127.0.0.1'] : ['sleep', '1000'], g:job_opts)" - ) - local pid = eval('jobpid(g:j)') - neq(NIL, api.nvim_get_proc(pid)) + -- Start a child process which doesn't die on stdin close. + local j = n.fn.jobstart({ n.nvim_prog, '--clean', '--headless' }) + local pid = n.fn.jobpid(j) + eq('number', type(api.nvim_get_proc(pid).pid)) clear() eq(NIL, api.nvim_get_proc(pid)) end) - it('can survive the exit of nvim with "detach"', function() - command('let g:job_opts.detach = 1') - command( - "let g:j = jobstart(has('win32') ? ['ping', '-n', '1001', '127.0.0.1'] : ['sleep', '1000'], g:job_opts)" - ) - local pid = eval('jobpid(g:j)') - neq(NIL, api.nvim_get_proc(pid)) + it('can survive Nvim exit with "detach"', function() + local j = n.fn.jobstart({ n.nvim_prog, '--clean', '--headless' }, { detach = true }) + local pid = n.fn.jobpid(j) + eq('number', type(api.nvim_get_proc(pid).pid)) clear() - neq(NIL, api.nvim_get_proc(pid)) - -- clean up after ourselves - eq(0, os_kill(pid)) + -- Still alive. + eq('number', type(api.nvim_get_proc(pid).pid)) + -- Clean up after ourselves. + eq(0, vim.uv.kill(pid, 'sigkill')) end) it('can pass user data to the callback', function() |