From 7e30fe315786c9e10817f87e5b80da70807e9cb1 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Thu, 2 Feb 2017 19:45:34 -0500 Subject: test: Make xclip exit after one selection request Closes #4900 --- test/functional/eval/system_spec.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/functional/eval/system_spec.lua b/test/functional/eval/system_spec.lua index d5845132dd..96cfd5a31a 100644 --- a/test/functional/eval/system_spec.lua +++ b/test/functional/eval/system_spec.lua @@ -266,7 +266,7 @@ describe('system()', function() pending('missing `xclip`', function() end) else it('will exit properly after passing input', function() - eq('', eval([[system('xclip -i -selection clipboard', 'clip-data')]])) + eq('', eval([[system('xclip -i -loops 1 -selection clipboard', 'clip-data')]])) eq('clip-data', eval([[system('xclip -o -selection clipboard')]])) end) end @@ -440,7 +440,7 @@ describe('systemlist()', function() else it('will exit properly after passing input', function() eq({}, eval( - "systemlist('xclip -i -selection clipboard', ['clip', 'data'])")) + "systemlist('xclip -i -loops 1 -selection clipboard', ['clip', 'data'])")) eq({'clip', 'data'}, eval( "systemlist('xclip -o -selection clipboard')")) end) -- cgit From ce51fa09551d6f807b87a05b8ec204f65fa70a4d Mon Sep 17 00:00:00 2001 From: James McCoy Date: Thu, 2 Feb 2017 19:52:59 -0500 Subject: test: Turn printargs_path into a function When test/functional/eval/system_spec.lua is run on its own, helpers.os_name() was being called before a session had been created. This caused that describe block to fail. Turning printargs_path into a function delays the call of helpers.os_name() until the test is being run, which ensures a session is available. --- test/functional/eval/system_spec.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/functional/eval/system_spec.lua b/test/functional/eval/system_spec.lua index 96cfd5a31a..ee75b593ff 100644 --- a/test/functional/eval/system_spec.lua +++ b/test/functional/eval/system_spec.lua @@ -30,8 +30,10 @@ describe('system()', function() before_each(clear) describe('command passed as a List', function() - local printargs_path = helpers.nvim_dir..'/printargs-test' - .. (helpers.os_name() == 'windows' and '.exe' or '') + local function printargs_path() + return helpers.nvim_dir..'/printargs-test' + .. (helpers.os_name() == 'windows' and '.exe' or '') + end it('sets v:shell_error if cmd[0] is not executable', function() call('system', { 'this-should-not-exist' }) @@ -63,16 +65,16 @@ describe('system()', function() it('quotes arguments correctly #5280', function() local out = call('system', - { printargs_path, [[1]], [[2 "3]], [[4 ' 5]], [[6 ' 7']] }) + { printargs_path(), [[1]], [[2 "3]], [[4 ' 5]], [[6 ' 7']] }) eq(0, eval('v:shell_error')) eq([[arg1=1;arg2=2 "3;arg3=4 ' 5;arg4=6 ' 7';]], out) - out = call('system', { printargs_path, [['1]], [[2 "3]] }) + out = call('system', { printargs_path(), [['1]], [[2 "3]] }) eq(0, eval('v:shell_error')) eq([[arg1='1;arg2=2 "3;]], out) - out = call('system', { printargs_path, "A\nB" }) + out = call('system', { printargs_path(), "A\nB" }) eq(0, eval('v:shell_error')) eq("arg1=A\nB;", out) end) -- cgit