functests: Replace check_provider -> missing_provider with err report

5 files changed, 18 insertions, 16 deletions

diff --git a/test/functional/ex_cmds/script_spec.lua b/test/functional/ex_cmds/script_spec.lua
index 0ee25d802c..4e57d2755d 100644
--- a/test/functional/ex_cmds/script_spec.lua
+++ b/test/functional/ex_cmds/script_spec.lua
@@ -7,7 +7,7 @@ local clear = helpers.clear
 local dedent = helpers.dedent
 local source = helpers.source
 local exc_exec = helpers.exc_exec
-local check_provider = helpers.check_provider
+local missing_provider = helpers.missing_provider
 
 before_each(clear)
 
@@ -61,9 +61,9 @@ describe('script_get-based command', function()
   test_garbage_exec('lua', true)
 
   -- Provider-based scripts
-  test_garbage_exec('ruby', check_provider('ruby'))
-  test_garbage_exec('python', check_provider('python'))
-  test_garbage_exec('python3', check_provider('python3'))
+  test_garbage_exec('ruby', not missing_provider('ruby'))
+  test_garbage_exec('python', not missing_provider('python'))
+  test_garbage_exec('python3', not missing_provider('python3'))
 
   -- Missing scripts
   test_garbage_exec('tcl', false)
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 3ec4532cfe..b03840b3fe 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -566,14 +566,14 @@ local function get_pathsep()
   return funcs.fnamemodify('.', ':p'):sub(-1)
 end
 
-local function check_provider(provider)
+local function missing_provider(provider)
   if provider == 'ruby' then
     local prog = funcs['provider#' .. provider .. '#Detect']()
-    return prog ~= ''
+    return prog == '' and (provider .. ' not detected') or false
   elseif provider == 'python' or provider == 'python3' then
     local py_major_version = (provider == 'python3' and 3 or 2)
     local errors = funcs['provider#pythonx#Detect'](py_major_version)[2]
-    return errors == ''
+    return errors ~= '' and errors or false
   else
     assert(false, 'Unknown provider: ' .. provider)
   end
@@ -645,7 +645,7 @@ local module = {
   meth_pcall = meth_pcall,
   NIL = mpack.NIL,
   get_pathsep = get_pathsep,
-  check_provider = check_provider,
+  missing_provider = missing_provider,
 }
 
 return function(after_each)
diff --git a/test/functional/provider/python3_spec.lua b/test/functional/provider/python3_spec.lua
index 68818afd05..aa50f53451 100644
--- a/test/functional/provider/python3_spec.lua
+++ b/test/functional/provider/python3_spec.lua
@@ -3,13 +3,14 @@ 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
 local feed_command = helpers.feed_command
-local check_provider = helpers.check_provider
+local missing_provider = helpers.missing_provider
 
 do
   clear()
-  if not check_provider('python3') then
+  local err = missing_provider('python3')
+  if err then
     pending(
-      'Python 3 (or the Python 3 neovim module) is broken or missing:\n' .. errors,
+      'Python 3 (or the Python 3 neovim module) is broken or missing:\n' .. err,
       function() end)
     return
   end
diff --git a/test/functional/provider/python_spec.lua b/test/functional/provider/python_spec.lua
index ccd095e8ec..25f5e0a6d0 100644
--- a/test/functional/provider/python_spec.lua
+++ b/test/functional/provider/python_spec.lua
@@ -12,13 +12,14 @@ local command = helpers.command
 local exc_exec = helpers.exc_exec
 local write_file = helpers.write_file
 local curbufmeths = helpers.curbufmeths
-local check_provider = helpers.check_provider
+local missing_provider = helpers.missing_provider
 
 do
   clear()
-  if not check_provider('python') then
+  local err = missing_provider('python')
+  if err then
     pending(
-      'Python 2 (or the Python 2 neovim module) is broken or missing:\n' .. errors,
+      'Python 2 (or the Python 2 neovim module) is broken or missing:\n' .. err,
       function() end)
     return
   end
diff --git a/test/functional/provider/ruby_spec.lua b/test/functional/provider/ruby_spec.lua
index 4e8eba494a..9f5ef3b3fc 100644
--- a/test/functional/provider/ruby_spec.lua
+++ b/test/functional/provider/ruby_spec.lua
@@ -10,11 +10,11 @@ local expect = helpers.expect
 local command = helpers.command
 local write_file = helpers.write_file
 local curbufmeths = helpers.curbufmeths
-local check_provider = helpers.check_provider
+local missing_provider = helpers.missing_provider
 
 do
   clear()
-  if not check_provider('ruby') then
+  if missing_provider('ruby') then
     pending(
       "Cannot find the neovim RubyGem. Try :CheckHealth",
       function() end)