Merge branch 'master' into luaviml'/lua

2 files changed, 78 insertions, 37 deletions

diff --git a/test/unit/os/env_spec.lua b/test/unit/os/env_spec.lua
index 1ffed784ff..823b6d6a85 100644
--- a/test/unit/os/env_spec.lua
+++ b/test/unit/os/env_spec.lua
@@ -35,17 +35,17 @@ describe('env function', function()
     local OK = 0
 
     itp('sets an env variable and returns OK', function()
-      local name = 'NEOVIM_UNIT_TEST_SETENV_1N'
-      local value = 'NEOVIM_UNIT_TEST_SETENV_1V'
+      local name = 'NVIM_UNIT_TEST_SETENV_1N'
+      local value = 'NVIM_UNIT_TEST_SETENV_1V'
       eq(nil, os.getenv(name))
       eq(OK, (os_setenv(name, value, 1)))
       eq(value, os.getenv(name))
     end)
 
     itp("dosn't overwrite an env variable if overwrite is 0", function()
-      local name = 'NEOVIM_UNIT_TEST_SETENV_2N'
-      local value = 'NEOVIM_UNIT_TEST_SETENV_2V'
-      local value_updated = 'NEOVIM_UNIT_TEST_SETENV_2V_UPDATED'
+      local name = 'NVIM_UNIT_TEST_SETENV_2N'
+      local value = 'NVIM_UNIT_TEST_SETENV_2V'
+      local value_updated = 'NVIM_UNIT_TEST_SETENV_2V_UPDATED'
       eq(OK, (os_setenv(name, value, 0)))
       eq(value, os.getenv(name))
       eq(OK, (os_setenv(name, value_updated, 0)))
@@ -69,8 +69,8 @@ describe('env function', function()
 
   describe('os_getenv', function()
     itp('reads an env variable', function()
-      local name = 'NEOVIM_UNIT_TEST_GETENV_1N'
-      local value = 'NEOVIM_UNIT_TEST_GETENV_1V'
+      local name = 'NVIM_UNIT_TEST_GETENV_1N'
+      local value = 'NVIM_UNIT_TEST_GETENV_1V'
       eq(NULL, os_getenv(name))
       -- need to use os_setenv, because lua dosn't have a setenv function
       os_setenv(name, value, 1)
@@ -78,7 +78,7 @@ describe('env function', function()
     end)
 
     itp('returns NULL if the env variable is not found', function()
-      local name = 'NEOVIM_UNIT_TEST_GETENV_NOTFOUND'
+      local name = 'NVIM_UNIT_TEST_GETENV_NOTFOUND'
       return eq(NULL, os_getenv(name))
     end)
   end)
@@ -97,8 +97,8 @@ describe('env function', function()
 
   describe('os_getenvname_at_index', function()
     itp('returns names of environment variables', function()
-      local test_name = 'NEOVIM_UNIT_TEST_GETENVNAME_AT_INDEX_1N'
-      local test_value = 'NEOVIM_UNIT_TEST_GETENVNAME_AT_INDEX_1V'
+      local test_name = 'NVIM_UNIT_TEST_GETENVNAME_AT_INDEX_1N'
+      local test_value = 'NVIM_UNIT_TEST_GETENVNAME_AT_INDEX_1V'
       os_setenv(test_name, test_value, 1)
       local i = 0
       local names = { }
@@ -160,16 +160,16 @@ describe('env function', function()
 
   describe('expand_env_esc', function()
     itp('expands environment variables', function()
-      local name = 'NEOVIM_UNIT_TEST_EXPAND_ENV_ESCN'
-      local value = 'NEOVIM_UNIT_TEST_EXPAND_ENV_ESCV'
+      local name = 'NVIM_UNIT_TEST_EXPAND_ENV_ESCN'
+      local value = 'NVIM_UNIT_TEST_EXPAND_ENV_ESCV'
       os_setenv(name, value, 1)
       -- TODO(bobtwinkles) This only tests Unix expansions. There should be a
       -- test for Windows as well
-      local input1 = to_cstr('$NEOVIM_UNIT_TEST_EXPAND_ENV_ESCN/test')
-      local input2 = to_cstr('${NEOVIM_UNIT_TEST_EXPAND_ENV_ESCN}/test')
+      local input1 = to_cstr('$NVIM_UNIT_TEST_EXPAND_ENV_ESCN/test')
+      local input2 = to_cstr('${NVIM_UNIT_TEST_EXPAND_ENV_ESCN}/test')
       local output_buff1 = cstr(255, '')
       local output_buff2 = cstr(255, '')
-      local output_expected = 'NEOVIM_UNIT_TEST_EXPAND_ENV_ESCV/test'
+      local output_expected = 'NVIM_UNIT_TEST_EXPAND_ENV_ESCV/test'
       cimp.expand_env_esc(input1, output_buff1, 255, false, true, NULL)
       cimp.expand_env_esc(input2, output_buff2, 255, false, true, NULL)
       eq(output_expected, ffi.string(output_buff1))
diff --git a/test/unit/os/fileio_spec.lua b/test/unit/os/fileio_spec.lua
index 7a738ce85c..e3c8e616ce 100644
--- a/test/unit/os/fileio_spec.lua
+++ b/test/unit/os/fileio_spec.lua
@@ -80,6 +80,10 @@ local function file_read(fp, size)
   return ret1, ret2
 end
 
+local function file_flush(fp)
+  return m.file_flush(fp)
+end
+
 local function file_fsync(fp)
   return m.file_fsync(fp)
 end
@@ -94,7 +98,7 @@ describe('file_open', function()
     eq(0, err)
     local attrs = lfs.attributes(filec)
     eq('rwx------', attrs.permissions)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can create a rw------- file with kFileCreate', function()
@@ -102,7 +106,7 @@ describe('file_open', function()
     eq(0, err)
     local attrs = lfs.attributes(filec)
     eq('rw-------', attrs.permissions)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can create a rwx------ file with kFileCreateOnly', function()
@@ -110,7 +114,7 @@ describe('file_open', function()
     eq(0, err)
     local attrs = lfs.attributes(filec)
     eq('rwx------', attrs.permissions)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can create a rw------- file with kFileCreateOnly', function()
@@ -118,7 +122,7 @@ describe('file_open', function()
     eq(0, err)
     local attrs = lfs.attributes(filec)
     eq('rw-------', attrs.permissions)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('fails to open an existing file with kFileCreateOnly', function()
@@ -137,35 +141,35 @@ describe('file_open', function()
     local err, fp = file_open(file1, m.kFileCreate, 384)
     eq(0, err)
     eq(true, fp.wr)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can open an existing file read-only with zero', function()
     local err, fp = file_open(file1, 0, 384)
     eq(0, err)
     eq(false, fp.wr)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can open an existing file read-only with kFileReadOnly', function()
     local err, fp = file_open(file1, m.kFileReadOnly, 384)
     eq(0, err)
     eq(false, fp.wr)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can open an existing file read-only with kFileNoSymlink', function()
     local err, fp = file_open(file1, m.kFileNoSymlink, 384)
     eq(0, err)
     eq(false, fp.wr)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can truncate an existing file with kFileTruncate', function()
     local err, fp = file_open(file1, m.kFileTruncate, 384)
     eq(0, err)
     eq(true, fp.wr)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
     local attrs = lfs.attributes(file1)
     eq(0, attrs.size)
   end)
@@ -174,7 +178,7 @@ describe('file_open', function()
     local err, fp = file_open(file1, m.kFileWriteOnly, 384)
     eq(0, err)
     eq(true, fp.wr)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
     local attrs = lfs.attributes(file1)
     eq(4096, attrs.size)
   end)
@@ -191,7 +195,7 @@ describe('file_open', function()
     local err, fp = file_open(linkf, m.kFileTruncate, 384)
     eq(0, err)
     eq(true, fp.wr)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
     local attrs = lfs.attributes(file1)
     eq(0, attrs.size)
   end)
@@ -217,7 +221,7 @@ describe('file_open_new', function()
     local err, fp = file_open_new(file1, 0, 384)
     eq(0, err)
     eq(false, fp.wr)
-    eq(0, m.file_free(fp))
+    eq(0, m.file_free(fp, false))
   end)
 
   itp('fails to open an existing file with kFileCreateOnly', function()
@@ -227,7 +231,29 @@ describe('file_open_new', function()
   end)
 end)
 
--- file_close is called above, so it is not tested directly
+describe('file_close', function()
+  itp('can flush writes to disk also with true argument', function()
+    local err, fp = file_open(filec, m.kFileCreateOnly, 384)
+    eq(0, err)
+    local wsize = file_write(fp, 'test')
+    eq(4, wsize)
+    eq(0, lfs.attributes(filec).size)
+    eq(0, m.file_close(fp, true))
+    eq(wsize, lfs.attributes(filec).size)
+  end)
+end)
+
+describe('file_free', function()
+  itp('can flush writes to disk also with true argument', function()
+    local err, fp = file_open_new(filec, m.kFileCreateOnly, 384)
+    eq(0, err)
+    local wsize = file_write(fp, 'test')
+    eq(4, wsize)
+    eq(0, lfs.attributes(filec).size)
+    eq(0, m.file_free(fp, true))
+    eq(wsize, lfs.attributes(filec).size)
+  end)
+end)
 
 describe('file_fsync', function()
   itp('can flush writes to disk', function()
@@ -240,7 +266,22 @@ describe('file_fsync', function()
     eq(0, lfs.attributes(filec).size)
     eq(0, file_fsync(fp))
     eq(wsize, lfs.attributes(filec).size)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
+  end)
+end)
+
+describe('file_flush', function()
+  itp('can flush writes to disk', function()
+    local err, fp = file_open(filec, m.kFileCreateOnly, 384)
+    eq(0, file_flush(fp))
+    eq(0, err)
+    eq(0, lfs.attributes(filec).size)
+    local wsize = file_write(fp, 'test')
+    eq(4, wsize)
+    eq(0, lfs.attributes(filec).size)
+    eq(0, file_flush(fp))
+    eq(wsize, lfs.attributes(filec).size)
+    eq(0, m.file_close(fp, false))
   end)
 end)
 
@@ -262,7 +303,7 @@ describe('file_read', function()
       eq({exp_err, exp_s}, {file_read(fp, size)})
       shift = shift + size
     end
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can read the whole file at once', function()
@@ -271,7 +312,7 @@ describe('file_read', function()
     eq(false, fp.wr)
     eq({#fcontents, fcontents}, {file_read(fp, #fcontents)})
     eq({0, ('\0'):rep(#fcontents)}, {file_read(fp, #fcontents)})
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can read more then 1024 bytes after reading a small chunk', function()
@@ -281,7 +322,7 @@ describe('file_read', function()
     eq({5, fcontents:sub(1, 5)}, {file_read(fp, 5)})
     eq({#fcontents - 5, fcontents:sub(6) .. (('\0'):rep(5))},
        {file_read(fp, #fcontents)})
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can read file by 768-byte-chunks', function()
@@ -301,7 +342,7 @@ describe('file_read', function()
       eq({exp_err, exp_s}, {file_read(fp, size)})
       shift = shift + size
     end
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 end)
 
@@ -312,7 +353,7 @@ describe('file_write', function()
     eq(true, fp.wr)
     local wr = file_write(fp, fcontents)
     eq(#fcontents, wr)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
     eq(wr, lfs.attributes(filec).size)
     eq(fcontents, io.open(filec):read('*a'))
   end)
@@ -329,7 +370,7 @@ describe('file_write', function()
       eq(wr, #s)
       shift = shift + size
     end
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
     eq(#fcontents, lfs.attributes(filec).size)
     eq(fcontents, io.open(filec):read('*a'))
   end)
@@ -346,7 +387,7 @@ describe('file_write', function()
       eq(wr, #s)
       shift = shift + size
     end
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
     eq(#fcontents, lfs.attributes(filec).size)
     eq(fcontents, io.open(filec):read('*a'))
   end)
@@ -361,6 +402,6 @@ describe('file_skip', function()
     local rd, s = file_read(fp, 3)
     eq(3, rd)
     eq(fcontents:sub(4, 6), s)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 end)