test: tui_spec.lua: use robust settings

This commit is contained in:
Justin M. Keyes 2017-11-27 00:27:40 +01:00
parent 944e3c0619
commit c8b40930c0

View File

@ -19,8 +19,8 @@ describe('tui', function()
before_each(function() before_each(function()
clear() clear()
screen = thelpers.screen_setup(0, '["'..helpers.nvim_prog screen = thelpers.screen_setup(0, '["'..nvim_prog
..'", "-u", "NONE", "-i", "NONE", "--cmd", "set noswapfile noshowcmd noruler"]') ..'", "-u", "NONE", "-i", "NONE", "--cmd", "set noswapfile noshowcmd noruler undodir=. directory=. viewdir=. backupdir=."]')
-- right now pasting can be really slow in the TUI, especially in ASAN. -- right now pasting can be really slow in the TUI, especially in ASAN.
-- this will be fixed later but for now we require a high timeout. -- this will be fixed later but for now we require a high timeout.
screen.timeout = 60000 screen.timeout = 60000
@ -383,10 +383,11 @@ describe("tui 't_Co' (terminal colors)", function()
-- This is ugly because :term/termopen() forces TERM=xterm-256color. -- This is ugly because :term/termopen() forces TERM=xterm-256color.
-- TODO: Revisit this after jobstart/termopen accept `env` dict. -- TODO: Revisit this after jobstart/termopen accept `env` dict.
screen = thelpers.screen_setup(0, string.format( screen = thelpers.screen_setup(0, string.format(
[=[['sh', '-c', 'LANG=C TERM=%s %s %s -u NONE -i NONE --cmd "silent set noswapfile noshowcmd noruler"']]=], [=[['sh', '-c', 'LANG=C TERM=%s %s %s -u NONE -i NONE --cmd "%s"']]=],
term or "", term or "",
(colorterm ~= nil and "COLORTERM="..colorterm or ""), (colorterm ~= nil and "COLORTERM="..colorterm or ""),
helpers.nvim_prog)) nvim_prog,
nvim_set))
feed_data(":echo &t_Co\n") feed_data(":echo &t_Co\n")
helpers.wait() helpers.wait()
@ -401,10 +402,10 @@ describe("tui 't_Co' (terminal colors)", function()
%s| %s|
%s| %s|
%s| %s|
{5:[No Name] }| %s|
%-3s | %-3s |
{3:-- TERMINAL --} | {3:-- TERMINAL --} |
]], tline, tline, tline, tostring(maxcolors and maxcolors or ""))) ]], tline, tline, tline, tline, tostring(maxcolors and maxcolors or "")))
end end
-- ansi and no terminal type at all: -- ansi and no terminal type at all: