From 64177e3e98371b9afad44ffa47f1a0b694c5742a Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Fri, 18 May 2018 19:30:15 -0400 Subject: win: test: don't test symlink if not admin user --- test/functional/legacy/delete_spec.lua | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'test/functional/legacy/delete_spec.lua') diff --git a/test/functional/legacy/delete_spec.lua b/test/functional/legacy/delete_spec.lua index 5ef456bfe3..b69caa6ef7 100644 --- a/test/functional/legacy/delete_spec.lua +++ b/test/functional/legacy/delete_spec.lua @@ -52,6 +52,10 @@ describe('Test for delete()', function() silent !ln -s Xfile Xlink endif ]]) + if eval('v:shell_error') == 1 then + eq(0, eval("delete('Xfile')")) + pending('Cannot create symlink', function()end) + end -- Delete the link, not the file eq(0, eval("delete('Xlink')")) eq(-1, eval("delete('Xlink')")) -- cgit From e21f454e116441443208f5c31beb01f67191b47a Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Fri, 25 May 2018 07:42:59 -0400 Subject: fixup: always delete Xfile, fix exit code check after_each + os.remove ensures Xfile is deleted after every test. Windows exit code is inconsistent. --- test/functional/legacy/delete_spec.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'test/functional/legacy/delete_spec.lua') diff --git a/test/functional/legacy/delete_spec.lua b/test/functional/legacy/delete_spec.lua index b69caa6ef7..9ea3269828 100644 --- a/test/functional/legacy/delete_spec.lua +++ b/test/functional/legacy/delete_spec.lua @@ -4,6 +4,9 @@ local eq, eval, command = helpers.eq, helpers.eval, helpers.command describe('Test for delete()', function() before_each(clear) + after_each(function() + os.remove('Xfile') + end) it('file delete', function() command('split Xfile') @@ -52,8 +55,7 @@ describe('Test for delete()', function() silent !ln -s Xfile Xlink endif ]]) - if eval('v:shell_error') == 1 then - eq(0, eval("delete('Xfile')")) + if eval('v:shell_error') ~= 0 then pending('Cannot create symlink', function()end) end -- Delete the link, not the file -- cgit