diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2022-11-13 14:52:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-13 05:52:19 -0800 |
| commit | 736c36c02f316c979da363c5120495179a2b6c2a (patch) | |
| tree | 97015d6701788a2c0b37b92c25033fff4f779ab9 /test/functional/api | |
| parent | 0a96f18ed774ebc27db50eba4d8a4437e970a331 (diff) | |
| download | rneovim-736c36c02f316c979da363c5120495179a2b6c2a.tar.gz rneovim-736c36c02f316c979da363c5120495179a2b6c2a.tar.bz2 rneovim-736c36c02f316c979da363c5120495179a2b6c2a.zip | |
test: introduce skip() #21010
This is essentially a convenience wrapper around the `pending()`
function, similar to `skip_fragile()` but more general-purpose.
Also remove `pending_win32` function as it can be replaced by
`skip(iswin())`.
Diffstat (limited to 'test/functional/api')
| -rw-r--r-- | test/functional/api/server_notifications_spec.lua | 9 | ||||
| -rw-r--r-- | test/functional/api/server_requests_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/api/vim_spec.lua | 3 |
3 files changed, 5 insertions, 9 deletions
diff --git a/test/functional/api/server_notifications_spec.lua b/test/functional/api/server_notifications_spec.lua index 1c00f001ff..77a80ac7f3 100644 --- a/test/functional/api/server_notifications_spec.lua +++ b/test/functional/api/server_notifications_spec.lua @@ -7,6 +7,7 @@ local exec_lua = helpers.exec_lua local retry = helpers.retry local isCI = helpers.isCI local assert_alive = helpers.assert_alive +local skip = helpers.skip describe('notify', function() local channel @@ -78,13 +79,7 @@ describe('notify', function() end) it('cancels stale events on channel close', function() - if isCI() then - pending('hangs on CI #14083 #15251') - return - elseif helpers.skip_fragile(pending) then - return - end - if helpers.pending_win32(pending) then return end + skip(isCI(), 'hangs on CI #14083 #15251') local catchan = eval("jobstart(['cat'], {'rpc': v:true})") local catpath = eval('exepath("cat")') eq({id=catchan, argv={catpath}, stream='job', mode='rpc', client = {}}, exec_lua ([[ diff --git a/test/functional/api/server_requests_spec.lua b/test/functional/api/server_requests_spec.lua index 00a4dd041d..045de94de2 100644 --- a/test/functional/api/server_requests_spec.lua +++ b/test/functional/api/server_requests_spec.lua @@ -250,7 +250,7 @@ describe('server -> client', function() pcall(funcs.jobstop, jobid) end) - if helpers.pending_win32(pending) then return end + if helpers.skip(helpers.iswin()) then return end it('rpc and text stderr can be combined', function() local status, rv = pcall(funcs.rpcrequest, jobid, 'poll') diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua index 114413365f..32b7c349b2 100644 --- a/test/functional/api/vim_spec.lua +++ b/test/functional/api/vim_spec.lua @@ -30,6 +30,7 @@ local exec_lua = helpers.exec_lua local exc_exec = helpers.exc_exec local insert = helpers.insert local expect_exit = helpers.expect_exit +local skip = helpers.skip local pcall_err = helpers.pcall_err local format_string = helpers.format_string @@ -2729,7 +2730,7 @@ describe('API', function() eq({}, meths.get_runtime_file("foobarlang/", true)) end) it('can handle bad patterns', function() - if helpers.pending_win32(pending) then return end + skip(iswin()) eq("Vim:E220: Missing }.", pcall_err(meths.get_runtime_file, "{", false)) |