Merge 'upstream/master' into pr-win-erw7

3 files changed, 17 insertions, 2 deletions

diff --git a/test/functional/provider/python3_spec.lua b/test/functional/provider/python3_spec.lua
index 93ac3ae017..5e73690986 100644
--- a/test/functional/provider/python3_spec.lua
+++ b/test/functional/provider/python3_spec.lua
@@ -2,6 +2,7 @@ local helpers = require('test.functional.helpers')(after_each)
 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 expect_err = helpers.expect_err
 local feed_command = helpers.feed_command
 local source = helpers.source
 local missing_provider = helpers.missing_provider
@@ -9,7 +10,11 @@ local missing_provider = helpers.missing_provider
 do
   clear()
   if missing_provider('python3') then
-    pending('Python 3 (or the neovim module) is broken/missing', function() end)
+    it(':python3 reports E319 if provider is missing', function()
+      expect_err([[Vim%(python3%):E319: No "python3" provider found.*]],
+                 command, 'python3 print("foo")')
+    end)
+    pending('Python 3 (or the pynvim module) is broken/missing', function() end)
     return
   end
 end
diff --git a/test/functional/provider/python_spec.lua b/test/functional/provider/python_spec.lua
index 2fa74e9644..15df76d2f6 100644
--- a/test/functional/provider/python_spec.lua
+++ b/test/functional/provider/python_spec.lua
@@ -8,6 +8,7 @@ local funcs = helpers.funcs
 local meths = helpers.meths
 local insert = helpers.insert
 local expect = helpers.expect
+local expect_err = helpers.expect_err
 local command = helpers.command
 local exc_exec = helpers.exc_exec
 local write_file = helpers.write_file
@@ -17,7 +18,11 @@ local missing_provider = helpers.missing_provider
 do
   clear()
   if missing_provider('python') then
-    pending('Python 2 (or the neovim module) is broken/missing', function() end)
+    it(':python reports E319 if provider is missing', function()
+      expect_err([[Vim%(python%):E319: No "python" provider found.*]],
+                 command, 'python print("foo")')
+    end)
+    pending('Python 2 (or the pynvim module) is broken/missing', function() end)
     return
   end
 end
diff --git a/test/functional/provider/ruby_spec.lua b/test/functional/provider/ruby_spec.lua
index e049ac7c41..40cfe80b50 100644
--- a/test/functional/provider/ruby_spec.lua
+++ b/test/functional/provider/ruby_spec.lua
@@ -6,6 +6,7 @@ local curbufmeths = helpers.curbufmeths
 local eq = helpers.eq
 local eval = helpers.eval
 local expect = helpers.expect
+local expect_err = helpers.expect_err
 local feed = helpers.feed
 local feed_command = helpers.feed_command
 local funcs = helpers.funcs
@@ -17,6 +18,10 @@ local write_file = helpers.write_file
 do
   clear()
   if missing_provider('ruby') then
+    it(':ruby reports E319 if provider is missing', function()
+      expect_err([[Vim%(ruby%):E319: No "ruby" provider found.*]],
+      command, 'ruby puts "foo"')
+    end)
     pending("Missing neovim RubyGem.", function() end)
     return
   end