From 736c36c02f316c979da363c5120495179a2b6c2a Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Sun, 13 Nov 2022 14:52:19 +0100
Subject: 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())`.
---
 test/functional/plugin/lsp_spec.lua | 4 +++-
 test/functional/plugin/man_spec.lua | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'test/functional/plugin')

diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
index a7094fff48..572d7a7d97 100644
--- a/test/functional/plugin/lsp_spec.lua
+++ b/test/functional/plugin/lsp_spec.lua
@@ -19,13 +19,15 @@ local read_file = require('test.helpers').read_file
 local write_file = require('test.helpers').write_file
 local isCI = helpers.isCI
 local meths = helpers.meths
+local iswin = helpers.iswin
+local skip = helpers.skip
 
 -- Use these to get access to a coroutine so that I can run async tests and use
 -- yield.
 local run, stop = helpers.run, helpers.stop
 
 -- TODO(justinmk): hangs on Windows https://github.com/neovim/neovim/pull/11837
-if helpers.pending_win32(pending) then return end
+if skip(iswin()) then return end
 
 -- Fake LSP server.
 local fake_lsp_code = 'test/functional/fixtures/fake-lsp-server.lua'
diff --git a/test/functional/plugin/man_spec.lua b/test/functional/plugin/man_spec.lua
index ebf131fd4a..c57f43c632 100644
--- a/test/functional/plugin/man_spec.lua
+++ b/test/functional/plugin/man_spec.lua
@@ -9,6 +9,7 @@ local matches = helpers.matches
 local write_file = helpers.write_file
 local tmpname = helpers.tmpname
 local isCI = helpers.isCI
+local skip = helpers.skip
 
 clear()
 if funcs.executable('man') == 0 then
@@ -161,9 +162,7 @@ describe(':Man', function()
   end)
 
   it('reports non-existent man pages for absolute paths', function()
-    if isCI('cirrus') then
-      pending('FIXME: cirrus')
-    end
+    skip(isCI('cirrus'))
     local actual_file = tmpname()
     -- actual_file must be an absolute path to an existent file for us to test against it
     matches('^/.+', actual_file)
-- 
cgit