From 209f05b48745e5e077d4d34ea7013d7bb20463de Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Fri, 18 May 2018 17:30:21 -0400 Subject: win: test: disable non-admin failing tests mkfifo (msysgit) does not work outside of msys2 environment. gzip tests fail on Windows. mklink requires admin privs for file symbolic links so mklink fails. --- test/functional/ex_cmds/write_spec.lua | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'test/functional/ex_cmds/write_spec.lua') diff --git a/test/functional/ex_cmds/write_spec.lua b/test/functional/ex_cmds/write_spec.lua index bcf83698bb..8702f40929 100644 --- a/test/functional/ex_cmds/write_spec.lua +++ b/test/functional/ex_cmds/write_spec.lua @@ -9,6 +9,7 @@ local command = helpers.command local feed_command = helpers.feed_command local funcs = helpers.funcs local meths = helpers.meths +local iswin = helpers.iswin local fname = 'Xtest-functional-ex_cmds-write' local fname_bak = fname .. '~' @@ -34,7 +35,7 @@ describe(':write', function() it('&backupcopy=auto preserves symlinks', function() command('set backupcopy=auto') write_file('test_bkc_file.txt', 'content0') - if helpers.iswin() then + if iswin() then command("silent !mklink test_bkc_link.txt test_bkc_file.txt") else command("silent !ln -s test_bkc_file.txt test_bkc_link.txt") @@ -51,7 +52,7 @@ describe(':write', function() it('&backupcopy=no replaces symlink with new file', function() command('set backupcopy=no') write_file('test_bkc_file.txt', 'content0') - if helpers.iswin() then + if iswin() then command("silent !mklink test_bkc_link.txt test_bkc_file.txt") else command("silent !ln -s test_bkc_file.txt test_bkc_link.txt") @@ -66,7 +67,8 @@ describe(':write', function() end) it("appends FIFO file", function() - if eval("executable('mkfifo')") == 0 then + -- mkfifo creates read-only .lnk files on Windows + if iswin() or eval("executable('mkfifo')") == 0 then pending('missing "mkfifo" command', function()end) return end @@ -88,7 +90,7 @@ describe(':write', function() command('let $HOME=""') eq(funcs.fnamemodify('.', ':p:h'), funcs.fnamemodify('.', ':p:h:~')) -- Message from check_overwrite - if not helpers.iswin() then + if not iswin() then eq(('\nE17: "'..funcs.fnamemodify('.', ':p:h')..'" is a directory'), redir_exec('write .')) end @@ -108,7 +110,7 @@ describe(':write', function() funcs.setfperm(fname, 'r--------') eq('Vim(write):E505: "Xtest-functional-ex_cmds-write" is read-only (add ! to override)', exc_exec('write')) - if helpers.iswin() then + if iswin() then eq(0, os.execute('del /q/f ' .. fname)) eq(0, os.execute('rd /q/s ' .. fname_bak)) else @@ -117,7 +119,7 @@ describe(':write', function() end write_file(fname_bak, 'TTYX') -- FIXME: exc_exec('write!') outputs 0 in Windows - if helpers.iswin() then return end + if iswin() then return end lfs.link(fname_bak .. ('/xxxxx'):rep(20), fname, true) eq('Vim(write):E166: Can\'t open linked file for writing', exc_exec('write!')) -- cgit 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/ex_cmds/write_spec.lua | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'test/functional/ex_cmds/write_spec.lua') diff --git a/test/functional/ex_cmds/write_spec.lua b/test/functional/ex_cmds/write_spec.lua index 8702f40929..3060fb063b 100644 --- a/test/functional/ex_cmds/write_spec.lua +++ b/test/functional/ex_cmds/write_spec.lua @@ -40,6 +40,9 @@ describe(':write', function() else command("silent !ln -s test_bkc_file.txt test_bkc_link.txt") end + if eval('v:shell_error') == 1 then + pending('Cannot create symlink', function()end) + end source([[ edit test_bkc_link.txt call setline(1, ['content1']) @@ -57,6 +60,9 @@ describe(':write', function() else command("silent !ln -s test_bkc_file.txt test_bkc_link.txt") end + if eval('v:shell_error') == 1 then + pending('Cannot create symlink', function()end) + end source([[ edit test_bkc_link.txt call setline(1, ['content1']) -- 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/ex_cmds/write_spec.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/functional/ex_cmds/write_spec.lua') diff --git a/test/functional/ex_cmds/write_spec.lua b/test/functional/ex_cmds/write_spec.lua index 3060fb063b..3f54ff6f41 100644 --- a/test/functional/ex_cmds/write_spec.lua +++ b/test/functional/ex_cmds/write_spec.lua @@ -40,7 +40,7 @@ describe(':write', function() else command("silent !ln -s test_bkc_file.txt test_bkc_link.txt") end - if eval('v:shell_error') == 1 then + if eval('v:shell_error') ~= 0 then pending('Cannot create symlink', function()end) end source([[ @@ -60,7 +60,7 @@ describe(':write', function() else command("silent !ln -s test_bkc_file.txt test_bkc_link.txt") end - if eval('v:shell_error') == 1 then + if eval('v:shell_error') ~= 0 then pending('Cannot create symlink', function()end) end source([[ -- cgit