diff options
| author | Daniel Hahler <git@thequod.de> | 2019-09-12 03:26:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 03:26:35 +0200 |
| commit | 11fe132dd9c2e7d9613a24bf6f976557a924c3a2 (patch) | |
| tree | def7e46a9d42ada3d38b18a307f83ffad826918c /test/functional/core/job_spec.lua | |
| parent | 108763171f6d26c098422925e58df585c415324f (diff) | |
| download | rneovim-11fe132dd9c2e7d9613a24bf6f976557a924c3a2.tar.gz rneovim-11fe132dd9c2e7d9613a24bf6f976557a924c3a2.tar.bz2 rneovim-11fe132dd9c2e7d9613a24bf6f976557a924c3a2.zip | |
tests: fix system_spec when run with clipboard manager (#10956)
* tests: move os_kill to functional helpers
* tests: fix system_spec when run with clipboard manager
Replaces "xclip" with a dedicated helper program.
Fixes: https://github.com/neovim/neovim/issues/4900#issuecomment-501866842
Diffstat (limited to 'test/functional/core/job_spec.lua')
| -rw-r--r-- | test/functional/core/job_spec.lua | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/test/functional/core/job_spec.lua b/test/functional/core/job_spec.lua index b745eb67ef..9c37e55f42 100644 --- a/test/functional/core/job_spec.lua +++ b/test/functional/core/job_spec.lua @@ -7,6 +7,7 @@ local clear, eq, eval, exc_exec, feed_command, feed, insert, neq, next_msg, nvim helpers.write_file, helpers.mkdir, helpers.rmdir local command = helpers.command local funcs = helpers.funcs +local os_kill = helpers.os_kill local retry = helpers.retry local meths = helpers.meths local NIL = helpers.NIL @@ -20,13 +21,6 @@ local expect_msg_seq = helpers.expect_msg_seq local pcall_err = helpers.pcall_err local Screen = require('test.functional.ui.screen') --- Kill process with given pid -local function os_kill(pid) - return os.execute((iswin() - and 'taskkill /f /t /pid '..pid..' > nul' - or 'kill -9 '..pid..' > /dev/null')) -end - describe('jobs', function() local channel |