IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

test/helpers.rmdir(): lfs.rmdir() instead of os.remove()

Browse Source 
os.remove() fails on empty directories in non-POSIX systems.
https://github.com/keplerproject/luafilesystem/issues/4

lfs.rmdir() "usually" works, so use it instead.

Closes #5236
This commit is contained in:
Justin M. Keyes 2016-09-20 03:02:48 +02:00
parent 764f576d64
commit 13e5724621
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/functional/helpers.lua
View File

@ -424,15 +424,15 @@ local function do_rmdir(path)
end end
end end
end end
local ret, err = os.remove(path) local ret, err = lfs.rmdir(path)
if not ret then if not ret then
error('os.remove: '..err) error('lfs.rmdir('..path..'): '..err)
end end
return ret return ret
end end
local function rmdir(path) local function rmdir(path)
local ret, err = pcall(do_rmdir, path) local ret, _ = pcall(do_rmdir, path)
-- During teardown, the nvim process may not exit quickly enough, then rmdir() -- During teardown, the nvim process may not exit quickly enough, then rmdir()
-- will fail (on Windows). -- will fail (on Windows).
if not ret then -- Try again. if not ret then -- Try again.