mirror of
https://github.com/neovim/neovim.git
synced 2026-01-04 18:37:02 +10:00
test: replace lfs with luv and vim.fs
test: replace lfs with luv luv already pretty much does everything lfs does, so this duplication of dependencies isn't needed.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
local lfs = require('lfs')
|
||||
local luv = require('luv')
|
||||
|
||||
local helpers = require('test.unit.helpers')(after_each)
|
||||
local itp = helpers.gen_itp(it)
|
||||
@@ -7,6 +7,7 @@ local eq = helpers.eq
|
||||
local ffi = helpers.ffi
|
||||
local cimport = helpers.cimport
|
||||
local cppimport = helpers.cppimport
|
||||
local mkdir = helpers.mkdir
|
||||
|
||||
local m = cimport('./src/nvim/os/os.h', './src/nvim/os/fileio.h')
|
||||
cppimport('fcntl.h')
|
||||
@@ -25,7 +26,7 @@ local linkb = dir .. '/broken.lnk'
|
||||
local filec = dir .. '/created-file.dat'
|
||||
|
||||
before_each(function()
|
||||
lfs.mkdir(dir);
|
||||
mkdir(dir);
|
||||
|
||||
local f1 = io.open(file1, 'w')
|
||||
f1:write(fcontents)
|
||||
@@ -35,8 +36,8 @@ before_each(function()
|
||||
f2:write(fcontents)
|
||||
f2:close()
|
||||
|
||||
lfs.link('file1.dat', linkf, true)
|
||||
lfs.link('broken.dat', linkb, true)
|
||||
luv.fs_symlink('file1.dat', linkf)
|
||||
luv.fs_symlink('broken.dat', linkb)
|
||||
end)
|
||||
|
||||
after_each(function()
|
||||
@@ -45,7 +46,7 @@ after_each(function()
|
||||
os.remove(linkf)
|
||||
os.remove(linkb)
|
||||
os.remove(filec)
|
||||
lfs.rmdir(dir)
|
||||
luv.fs_rmdir(dir)
|
||||
end)
|
||||
|
||||
local function file_open(fname, flags, mode)
|
||||
@@ -119,13 +120,13 @@ describe('file_open_fd', function()
|
||||
eq(0, m.file_close(fp, false))
|
||||
end)
|
||||
itp('can use file descriptor returned by os_open for writing', function()
|
||||
eq(nil, lfs.attributes(filec))
|
||||
eq(nil, luv.fs_stat(filec))
|
||||
local fd = m.os_open(filec, m.kO_WRONLY + m.kO_CREAT, 384)
|
||||
local err, fp = file_open_fd(fd, m.kFileWriteOnly)
|
||||
eq(0, err)
|
||||
eq(4, file_write(fp, 'test'))
|
||||
eq(0, m.file_close(fp, false))
|
||||
eq(4, lfs.attributes(filec).size)
|
||||
eq(4, luv.fs_stat(filec).size)
|
||||
eq('test', io.open(filec):read('*a'))
|
||||
end)
|
||||
end)
|
||||
@@ -139,13 +140,13 @@ describe('file_open_fd_new', function()
|
||||
eq(0, m.file_free(fp, false))
|
||||
end)
|
||||
itp('can use file descriptor returned by os_open for writing', function()
|
||||
eq(nil, lfs.attributes(filec))
|
||||
eq(nil, luv.fs_stat(filec))
|
||||
local fd = m.os_open(filec, m.kO_WRONLY + m.kO_CREAT, 384)
|
||||
local err, fp = file_open_fd_new(fd, m.kFileWriteOnly)
|
||||
eq(0, err)
|
||||
eq(4, file_write(fp, 'test'))
|
||||
eq(0, m.file_free(fp, false))
|
||||
eq(4, lfs.attributes(filec).size)
|
||||
eq(4, luv.fs_stat(filec).size)
|
||||
eq('test', io.open(filec):read('*a'))
|
||||
end)
|
||||
end)
|
||||
@@ -154,32 +155,32 @@ describe('file_open', function()
|
||||
itp('can create a rwx------ file with kFileCreate', function()
|
||||
local err, fp = file_open(filec, m.kFileCreate, 448)
|
||||
eq(0, err)
|
||||
local attrs = lfs.attributes(filec)
|
||||
eq('rwx------', attrs.permissions)
|
||||
local attrs = luv.fs_stat(filec)
|
||||
eq(33216, attrs.mode)
|
||||
eq(0, m.file_close(fp, false))
|
||||
end)
|
||||
|
||||
itp('can create a rw------- file with kFileCreate', function()
|
||||
local err, fp = file_open(filec, m.kFileCreate, 384)
|
||||
eq(0, err)
|
||||
local attrs = lfs.attributes(filec)
|
||||
eq('rw-------', attrs.permissions)
|
||||
local attrs = luv.fs_stat(filec)
|
||||
eq(33152, attrs.mode)
|
||||
eq(0, m.file_close(fp, false))
|
||||
end)
|
||||
|
||||
itp('can create a rwx------ file with kFileCreateOnly', function()
|
||||
local err, fp = file_open(filec, m.kFileCreateOnly, 448)
|
||||
eq(0, err)
|
||||
local attrs = lfs.attributes(filec)
|
||||
eq('rwx------', attrs.permissions)
|
||||
local attrs = luv.fs_stat(filec)
|
||||
eq(33216, attrs.mode)
|
||||
eq(0, m.file_close(fp, false))
|
||||
end)
|
||||
|
||||
itp('can create a rw------- file with kFileCreateOnly', function()
|
||||
local err, fp = file_open(filec, m.kFileCreateOnly, 384)
|
||||
eq(0, err)
|
||||
local attrs = lfs.attributes(filec)
|
||||
eq('rw-------', attrs.permissions)
|
||||
local attrs = luv.fs_stat(filec)
|
||||
eq(33152, attrs.mode)
|
||||
eq(0, m.file_close(fp, false))
|
||||
end)
|
||||
|
||||
@@ -228,7 +229,7 @@ describe('file_open', function()
|
||||
eq(0, err)
|
||||
eq(true, fp.wr)
|
||||
eq(0, m.file_close(fp, false))
|
||||
local attrs = lfs.attributes(file1)
|
||||
local attrs = luv.fs_stat(file1)
|
||||
eq(0, attrs.size)
|
||||
end)
|
||||
|
||||
@@ -237,14 +238,14 @@ describe('file_open', function()
|
||||
eq(0, err)
|
||||
eq(true, fp.wr)
|
||||
eq(0, m.file_close(fp, false))
|
||||
local attrs = lfs.attributes(file1)
|
||||
local attrs = luv.fs_stat(file1)
|
||||
eq(4096, attrs.size)
|
||||
end)
|
||||
|
||||
itp('fails to create a file with just kFileWriteOnly', function()
|
||||
local err, _ = file_open(filec, m.kFileWriteOnly, 384)
|
||||
eq(m.UV_ENOENT, err)
|
||||
local attrs = lfs.attributes(filec)
|
||||
local attrs = luv.fs_stat(filec)
|
||||
eq(nil, attrs)
|
||||
end)
|
||||
|
||||
@@ -254,7 +255,7 @@ describe('file_open', function()
|
||||
eq(0, err)
|
||||
eq(true, fp.wr)
|
||||
eq(0, m.file_close(fp, false))
|
||||
local attrs = lfs.attributes(file1)
|
||||
local attrs = luv.fs_stat(file1)
|
||||
eq(0, attrs.size)
|
||||
end)
|
||||
|
||||
@@ -295,9 +296,9 @@ describe('file_close', function()
|
||||
eq(0, err)
|
||||
local wsize = file_write(fp, 'test')
|
||||
eq(4, wsize)
|
||||
eq(0, lfs.attributes(filec).size)
|
||||
eq(0, luv.fs_stat(filec).size)
|
||||
eq(0, m.file_close(fp, true))
|
||||
eq(wsize, lfs.attributes(filec).size)
|
||||
eq(wsize, luv.fs_stat(filec).size)
|
||||
end)
|
||||
end)
|
||||
|
||||
@@ -307,9 +308,9 @@ describe('file_free', function()
|
||||
eq(0, err)
|
||||
local wsize = file_write(fp, 'test')
|
||||
eq(4, wsize)
|
||||
eq(0, lfs.attributes(filec).size)
|
||||
eq(0, luv.fs_stat(filec).size)
|
||||
eq(0, m.file_free(fp, true))
|
||||
eq(wsize, lfs.attributes(filec).size)
|
||||
eq(wsize, luv.fs_stat(filec).size)
|
||||
end)
|
||||
end)
|
||||
|
||||
@@ -318,12 +319,12 @@ describe('file_fsync', function()
|
||||
local err, fp = file_open(filec, m.kFileCreateOnly, 384)
|
||||
eq(0, file_fsync(fp))
|
||||
eq(0, err)
|
||||
eq(0, lfs.attributes(filec).size)
|
||||
eq(0, luv.fs_stat(filec).size)
|
||||
local wsize = file_write(fp, 'test')
|
||||
eq(4, wsize)
|
||||
eq(0, lfs.attributes(filec).size)
|
||||
eq(0, luv.fs_stat(filec).size)
|
||||
eq(0, file_fsync(fp))
|
||||
eq(wsize, lfs.attributes(filec).size)
|
||||
eq(wsize, luv.fs_stat(filec).size)
|
||||
eq(0, m.file_close(fp, false))
|
||||
end)
|
||||
end)
|
||||
@@ -333,12 +334,12 @@ describe('file_flush', function()
|
||||
local err, fp = file_open(filec, m.kFileCreateOnly, 384)
|
||||
eq(0, file_flush(fp))
|
||||
eq(0, err)
|
||||
eq(0, lfs.attributes(filec).size)
|
||||
eq(0, luv.fs_stat(filec).size)
|
||||
local wsize = file_write(fp, 'test')
|
||||
eq(4, wsize)
|
||||
eq(0, lfs.attributes(filec).size)
|
||||
eq(0, luv.fs_stat(filec).size)
|
||||
eq(0, file_flush(fp))
|
||||
eq(wsize, lfs.attributes(filec).size)
|
||||
eq(wsize, luv.fs_stat(filec).size)
|
||||
eq(0, m.file_close(fp, false))
|
||||
end)
|
||||
end)
|
||||
@@ -412,7 +413,7 @@ describe('file_write', function()
|
||||
local wr = file_write(fp, fcontents)
|
||||
eq(#fcontents, wr)
|
||||
eq(0, m.file_close(fp, false))
|
||||
eq(wr, lfs.attributes(filec).size)
|
||||
eq(wr, luv.fs_stat(filec).size)
|
||||
eq(fcontents, io.open(filec):read('*a'))
|
||||
end)
|
||||
|
||||
@@ -429,7 +430,7 @@ describe('file_write', function()
|
||||
shift = shift + size
|
||||
end
|
||||
eq(0, m.file_close(fp, false))
|
||||
eq(#fcontents, lfs.attributes(filec).size)
|
||||
eq(#fcontents, luv.fs_stat(filec).size)
|
||||
eq(fcontents, io.open(filec):read('*a'))
|
||||
end)
|
||||
|
||||
@@ -446,7 +447,7 @@ describe('file_write', function()
|
||||
shift = shift + size
|
||||
end
|
||||
eq(0, m.file_close(fp, false))
|
||||
eq(#fcontents, lfs.attributes(filec).size)
|
||||
eq(#fcontents, luv.fs_stat(filec).size)
|
||||
eq(fcontents, io.open(filec):read('*a'))
|
||||
end)
|
||||
end)
|
||||
|
||||
Reference in New Issue
Block a user