aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/functional/api/server_requests_spec.lua7
-rw-r--r--test/functional/ex_cmds/oldfiles_spec.lua2
-rw-r--r--test/functional/helpers.lua9
-rw-r--r--test/functional/plugin/helpers.lua4
-rw-r--r--test/functional/shada/helpers.lua5
-rw-r--r--test/functional/shada/marks_spec.lua4
-rw-r--r--test/functional/shada/shada_spec.lua6
-rw-r--r--test/functional/ui/embed_spec.lua16
8 files changed, 25 insertions, 28 deletions
diff --git a/test/functional/api/server_requests_spec.lua b/test/functional/api/server_requests_spec.lua
index 856e5ca4d2..4d25ba0819 100644
--- a/test/functional/api/server_requests_spec.lua
+++ b/test/functional/api/server_requests_spec.lua
@@ -9,7 +9,7 @@ local nvim_prog, command, funcs = helpers.nvim_prog, helpers.command, helpers.fu
local source, next_msg = helpers.source, helpers.next_msg
local ok = helpers.ok
local meths = helpers.meths
-local spawn, nvim_argv = helpers.spawn, helpers.nvim_argv
+local spawn, merge_args = helpers.spawn, helpers.merge_args
local set_session = helpers.set_session
local expect_err = helpers.expect_err
@@ -23,7 +23,7 @@ describe('server -> client', function()
it('handles unexpected closed stream while preparing RPC response', function()
source([[
- let g:_nvim_args = [v:progpath, '--embed', '-n', '-u', 'NONE', '-i', 'NONE', ]
+ let g:_nvim_args = [v:progpath, '--embed', '--headless', '-n', '-u', 'NONE', '-i', 'NONE', ]
let ch1 = jobstart(g:_nvim_args, {'rpc': v:true})
let child1_ch = rpcrequest(ch1, "nvim_get_api_info")[0]
call rpcnotify(ch1, 'nvim_eval', 'rpcrequest('.child1_ch.', "nvim_get_api_info")')
@@ -189,7 +189,7 @@ describe('server -> client', function()
end
before_each(function()
- command("let vim = rpcstart('"..nvim_prog.."', ['-u', 'NONE', '-i', 'NONE', '--cmd', 'set noswapfile', '--embed'])")
+ command("let vim = rpcstart('"..nvim_prog.."', ['-u', 'NONE', '-i', 'NONE', '--cmd', 'set noswapfile', '--embed', '--headless'])")
neq(0, eval('vim'))
end)
@@ -268,6 +268,7 @@ describe('server -> client', function()
end)
describe('connecting to another (peer) nvim', function()
+ local nvim_argv = merge_args(helpers.nvim_argv, {'--headless'})
local function connect_test(server, mode, address)
local serverpid = funcs.getpid()
local client = spawn(nvim_argv)
diff --git a/test/functional/ex_cmds/oldfiles_spec.lua b/test/functional/ex_cmds/oldfiles_spec.lua
index 448326cdfb..e2958c2924 100644
--- a/test/functional/ex_cmds/oldfiles_spec.lua
+++ b/test/functional/ex_cmds/oldfiles_spec.lua
@@ -9,7 +9,7 @@ local eval = helpers.eval
local shada_file = 'Xtest.shada'
local function _clear()
- set_session(spawn({nvim_prog, '--embed', '-u', 'NONE',
+ set_session(spawn({nvim_prog, '--embed', '--headless', '-u', 'NONE',
-- Need shada for these tests.
'-i', shada_file,
'--cmd', 'set noswapfile undodir=. directory=. viewdir=. backupdir=. belloff= noshowcmd noruler'}))
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 8823a6e003..a51eca7fdc 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -330,6 +330,7 @@ local function clear(...)
local new_args
local env = nil
local opts = select(1, ...)
+ local headless = true
if type(opts) == 'table' then
if opts.env then
local env_tbl = {}
@@ -355,15 +356,19 @@ local function clear(...)
end
end
new_args = opts.args or {}
+ if opts.headless == false then
+ headless = false
+ end
else
new_args = {...}
end
+ if headless then
+ table.insert(args, '--headless')
+ end
for _, arg in ipairs(new_args) do
table.insert(args, arg)
end
set_session(spawn(args, nil, env))
- -- Dummy request so that --embed continues past UI initialization
- session:request('nvim_eval', "0")
end
local function insert(...)
diff --git a/test/functional/plugin/helpers.lua b/test/functional/plugin/helpers.lua
index bd482d2db7..4359380bd7 100644
--- a/test/functional/plugin/helpers.lua
+++ b/test/functional/plugin/helpers.lua
@@ -3,7 +3,6 @@ local paths = require('test.config.paths')
local helpers = require('test.functional.helpers')(nil)
local spawn, set_session, nvim_prog, merge_args =
helpers.spawn, helpers.set_session, helpers.nvim_prog, helpers.merge_args
-local request = helpers.request
local additional_cmd = ''
@@ -14,7 +13,7 @@ local function nvim_argv(shada_file)
'--cmd', 'set shortmess+=I background=light noswapfile belloff= noshowcmd noruler',
'--cmd', 'let &runtimepath=' .. rtp_value,
'--cmd', additional_cmd,
- '--embed'}
+ '--embed', '--headless'}
if helpers.prepend_argv then
return merge_args(helpers.prepend_argv, nvim_args)
else
@@ -30,7 +29,6 @@ local function reset(...)
end
session = spawn(nvim_argv(...))
set_session(session)
- request('nvim_eval', "0")
end
local function set_additional_cmd(s)
diff --git a/test/functional/shada/helpers.lua b/test/functional/shada/helpers.lua
index 1312d762d8..d5e061bb50 100644
--- a/test/functional/shada/helpers.lua
+++ b/test/functional/shada/helpers.lua
@@ -9,9 +9,12 @@ local tmpname = helpers.tmpname()
local append_argv = nil
local function nvim_argv(shada_file, embed)
+ if embed == nil then
+ embed = true
+ end
local argv = {nvim_prog, '-u', 'NONE', '-i', shada_file or tmpname, '-N',
'--cmd', 'set shortmess+=I background=light noswapfile',
- embed or '--embed'}
+ '--headless', embed and '--embed' or nil}
if helpers.prepend_argv or append_argv then
return merge_args(helpers.prepend_argv, argv, append_argv)
else
diff --git a/test/functional/shada/marks_spec.lua b/test/functional/shada/marks_spec.lua
index 4cceae1aa3..c2f6351e00 100644
--- a/test/functional/shada/marks_spec.lua
+++ b/test/functional/shada/marks_spec.lua
@@ -224,7 +224,7 @@ describe('ShaDa support code', function()
it('does not create incorrect file for non-existent buffers when writing from -c',
function()
add_argv('--cmd', 'silent edit ' .. non_existent_testfilename, '-c', 'qall')
- local argv = nvim_argv(nil, '--headless')
+ local argv = nvim_argv(nil, false) -- no --embed
eq('', funcs.system(argv))
eq(0, exc_exec('rshada'))
end)
@@ -233,7 +233,7 @@ describe('ShaDa support code', function()
function()
add_argv('-c', 'silent edit ' .. non_existent_testfilename,
'-c', 'autocmd VimEnter * qall')
- local argv = nvim_argv(nil, '--headless')
+ local argv = nvim_argv(nil, false) -- no --embed
eq('', funcs.system(argv))
eq(0, exc_exec('rshada'))
end)
diff --git a/test/functional/shada/shada_spec.lua b/test/functional/shada/shada_spec.lua
index 720855860a..5f7daf73e5 100644
--- a/test/functional/shada/shada_spec.lua
+++ b/test/functional/shada/shada_spec.lua
@@ -137,7 +137,7 @@ describe('ShaDa support code', function()
it('does not write NONE file', function()
local session = spawn({nvim_prog, '-u', 'NONE', '-i', 'NONE', '--embed',
- '--cmd', 'qall'}, true)
+ '--headless', '--cmd', 'qall'}, true)
session:close()
eq(nil, lfs.attributes('NONE'))
eq(nil, lfs.attributes('NONE.tmp.a'))
@@ -145,8 +145,8 @@ describe('ShaDa support code', function()
it('does not read NONE file', function()
write_file('NONE', '\005\001\015\131\161na\162rX\194\162rc\145\196\001-')
- local session = spawn({nvim_prog, '-u', 'NONE', '-i', 'NONE', '--embed'},
- true)
+ local session = spawn({nvim_prog, '-u', 'NONE', '-i', 'NONE', '--embed',
+ '--headless'}, true)
set_session(session)
eq('', funcs.getreg('a'))
session:close()
diff --git a/test/functional/ui/embed_spec.lua b/test/functional/ui/embed_spec.lua
index afe4db66b3..6a5227803d 100644
--- a/test/functional/ui/embed_spec.lua
+++ b/test/functional/ui/embed_spec.lua
@@ -3,18 +3,12 @@ local Screen = require('test.functional.ui.screen')
local feed = helpers.feed
local eq = helpers.eq
-local spawn, set_session = helpers.spawn, helpers.set_session
-local nvim_prog, nvim_set = helpers.nvim_prog, helpers.nvim_set
-local merge_args, prepend_argv = helpers.merge_args, helpers.prepend_argv
+local clear = helpers.clear
local function test_embed(ext_newgrid)
- local session, screen
+ local screen
local function startup(...)
- local nvim_argv = {nvim_prog, '-u', 'NONE', '-i', 'NONE',
- '--cmd', nvim_set, '--embed'}
- nvim_argv = merge_args(prepend_argv, nvim_argv, {...})
- session = spawn(nvim_argv)
- set_session(session)
+ clear{headless=false, args={...}}
-- attach immediately after startup, for early UI
screen = Screen.new(60, 8)
@@ -26,10 +20,6 @@ local function test_embed(ext_newgrid)
})
end
- after_each(function()
- session:close()
- end)
-
it('can display errors', function()
startup('--cmd', 'echoerr invalid+')
screen:expect([[
generated by cgit (git 2.34.1) at 2025-06-02 19:53:53 +0000