From 54596396bc3310d7e35b0b74165663293e307ba8 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Tue, 22 Sep 2015 14:33:08 +0200
Subject: test: Check for installed Python module with Vimscript function.

Use the existing Vimscript function provider#pythonx#Detect()
to determine whether the Neovim Python module is installed and
Python 2/3 tests can be run.
---
 test/functional/provider/python3_spec.lua | 18 +++++++++---------
 test/functional/provider/python_spec.lua  | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/test/functional/provider/python3_spec.lua b/test/functional/provider/python3_spec.lua
index 5be5390370..5ecc1a0a91 100644
--- a/test/functional/provider/python3_spec.lua
+++ b/test/functional/provider/python3_spec.lua
@@ -1,19 +1,19 @@
+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
+
 do
-  local proc = io.popen(
-    [[python3 -c 'import neovim, sys; sys.stdout.write("ok")' 2> /dev/null]])
-  if proc:read() ~= 'ok' then
+  command('let [g:interp, g:errors] = provider#pythonx#Detect(3)')
+  local errors = eval('g:errors')
+  if errors ~= '' then
     pending(
-      'python3 (or the python3 neovim module) is broken or missing',
+      'Python 3 (or the Python 3 neovim module) is broken or missing:\n' .. errors,
       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/provider/python_spec.lua b/test/functional/provider/python_spec.lua
index ec1a853546..f37c16a26a 100644
--- a/test/functional/provider/python_spec.lua
+++ b/test/functional/provider/python_spec.lua
@@ -1,19 +1,19 @@
+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
+
 do
-  local proc = io.popen(
-    [[python -c 'import neovim, sys; sys.stdout.write("ok")' 2> /dev/null]])
-  if proc:read() ~= 'ok' then
+  command('let [g:interp, g:errors] = provider#pythonx#Detect(2)')
+  local errors = eval('g:errors')
+  if errors ~= '' then
     pending(
-      'python (or the python neovim module) is broken or missing',
+      'Python 2 (or the Python 2 neovim module) is broken or missing:\n' .. errors,
       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()
-- 
cgit