From 8b171b8c507dd9db01abee169d3a71e33f8e8ff4 Mon Sep 17 00:00:00 2001 From: ZyX Date: Fri, 12 May 2017 20:03:05 +0300 Subject: functests: Test invalid behaviour Test correctly fail for oneline ruby, python and python3. --- test/functional/helpers.lua | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'test/functional/helpers.lua') diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua index 1be70f917c..3ec4532cfe 100644 --- a/test/functional/helpers.lua +++ b/test/functional/helpers.lua @@ -566,6 +566,19 @@ local function get_pathsep() return funcs.fnamemodify('.', ':p'):sub(-1) end +local function check_provider(provider) + if provider == 'ruby' then + local prog = funcs['provider#' .. provider .. '#Detect']() + return prog ~= '' + 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 == '' + else + assert(false, 'Unknown provider: ' .. provider) + end +end + local module = { prepend_argv = prepend_argv, clear = clear, @@ -632,6 +645,7 @@ local module = { meth_pcall = meth_pcall, NIL = mpack.NIL, get_pathsep = get_pathsep, + check_provider = check_provider, } return function(after_each) -- cgit From 19d38c4d0f98004e8b2c39821f9bee8ca7e2f5d2 Mon Sep 17 00:00:00 2001 From: ZyX Date: Fri, 12 May 2017 20:47:33 +0300 Subject: functests: Replace check_provider -> missing_provider with err report --- test/functional/helpers.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/functional/helpers.lua') 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) -- cgit