Merge #3149 'Fix pending() invocations'.

6 files changed, 15 insertions, 15 deletions

diff --git a/test/functional/legacy/077_mf_hash_grow_spec.lua b/test/functional/legacy/077_mf_hash_grow_spec.lua
index 01d916ef04..825f08e968 100644
--- a/test/functional/legacy/077_mf_hash_grow_spec.lua
+++ b/test/functional/legacy/077_mf_hash_grow_spec.lua
@@ -15,7 +15,7 @@ describe('mf_hash_grow()', function()
 
   -- Check to see if cksum exists, otherwise skip the test
   if os.execute('which cksum 2>&1 > /dev/null') ~= 0 then
-    pending("was not tested because cksum was not found")
+    pending('was not tested because cksum was not found', function() end)
   else
     it('is working', function()
       execute('set fileformat=unix undolevels=-1')
diff --git a/test/functional/runtime/autoload/remote/define_spec.lua b/test/functional/provider/define_spec.lua
index 9b97ed84d9..9b97ed84d9 100644
--- a/test/functional/runtime/autoload/remote/define_spec.lua
+++ b/test/functional/provider/define_spec.lua
diff --git a/test/functional/runtime/autoload/provider/python3_spec.lua b/test/functional/provider/python3_spec.lua
index 43889b7b2a..5be5390370 100644
--- a/test/functional/runtime/autoload/provider/python3_spec.lua
+++ b/test/functional/provider/python3_spec.lua
@@ -1,19 +1,19 @@
 do
-  local proc =
-    io.popen([[python3 -c 'import neovim, sys; sys.stdout.write("ok")' 2> /dev/null]])
+  local proc = io.popen(
+    [[python3 -c 'import neovim, sys; sys.stdout.write("ok")' 2> /dev/null]])
   if proc:read() ~= 'ok' then
-    -- Don't run these tests if python3 is not available
+    pending(
+      'python3 (or the python3 neovim module) is broken or missing',
+      function() end)
     return
   end
 end
 
-
 local helpers = require('test.functional.helpers')
 local eval, command, feed = helpers.eval, helpers.command, helpers.feed
 local eq, clear, insert = helpers.eq, helpers.clear, helpers.insert
 local expect, write_file = helpers.expect, helpers.write_file
 
-
 describe('python3 commands and functions', function()
   before_each(function()
     clear()
diff --git a/test/functional/runtime/autoload/provider/python_spec.lua b/test/functional/provider/python_spec.lua
index e71a7a4309..ec1a853546 100644
--- a/test/functional/runtime/autoload/provider/python_spec.lua
+++ b/test/functional/provider/python_spec.lua
@@ -1,19 +1,19 @@
 do
-  local proc =
-    io.popen([[python -c 'import neovim, sys; sys.stdout.write("ok")' 2> /dev/null]])
+  local proc = io.popen(
+    [[python -c 'import neovim, sys; sys.stdout.write("ok")' 2> /dev/null]])
   if proc:read() ~= 'ok' then
-    -- Don't run these tests if python is not available
+    pending(
+      'python (or the python neovim module) is broken or missing',
+      function() end)
     return
   end
 end
 
-
 local helpers = require('test.functional.helpers')
 local eval, command, feed = helpers.eval, helpers.command, helpers.feed
 local eq, clear, insert = helpers.eq, helpers.clear, helpers.insert
 local expect, write_file = helpers.expect, helpers.write_file
 
-
 describe('python commands and functions', function()
   before_each(function()
     clear()
diff --git a/test/functional/shell/viml_system_spec.lua b/test/functional/shell/viml_system_spec.lua
index 6e10715612..4985c24aec 100644
--- a/test/functional/shell/viml_system_spec.lua
+++ b/test/functional/shell/viml_system_spec.lua
@@ -186,7 +186,7 @@ describe('system()', function()
 
   describe("with a program that doesn't close stdout", function()
     if not xclip then
-      pending('skipped (missing xclip)')
+      pending('skipped (missing xclip)', function() end)
     else
       it('will exit properly after passing input', function()
         eq('', eval([[system('xclip -i -selection clipboard', 'clip-data')]]))
@@ -365,7 +365,7 @@ describe('systemlist()', function()
 
   describe("with a program that doesn't close stdout", function()
     if not xclip then
-      pending('skipped (missing xclip)')
+      pending('skipped (missing xclip)', function() end)
     else
       it('will exit properly after passing input', function()
         eq({}, eval(
diff --git a/test/unit/os/fs_spec.lua b/test/unit/os/fs_spec.lua
index 20aca9109e..f7f0cba951 100644
--- a/test/unit/os/fs_spec.lua
+++ b/test/unit/os/fs_spec.lua
@@ -270,7 +270,7 @@ describe('fs function', function()
 
       -- Some systems may not have `id` utility.
       if (os.execute('id -G > /dev/null 2>&1') ~= 0) then
-        pending('skipped (missing `id` utility)')
+        pending('skipped (missing `id` utility)', function() end)
       else
         it('owner of a file may change the group of the file to any group of which that owner is a member', function()
           local file_gid = lfs.attributes(filename, 'gid')
@@ -296,7 +296,7 @@ describe('fs function', function()
       -- On Windows `os_fchown` always returns 0
       -- because `uv_fs_chown` is no-op on this platform.
       if (ffi.os == 'Windows' or ffi.C.geteuid() == 0) then
-        pending('skipped (os_fchown is no-op on Windows)')
+        pending('skipped (os_fchown is no-op on Windows)', function() end)
       else
         it('returns nonzero if process has not enough permissions', function()
           -- chown to root