Merge remote-tracking branch 'upstream/master' into fix_20726

1 files changed, 6 insertions, 7 deletions

diff --git a/test/functional/ex_cmds/profile_spec.lua b/test/functional/ex_cmds/profile_spec.lua
index 2b92f8d0de..249373a9c4 100644
--- a/test/functional/ex_cmds/profile_spec.lua
+++ b/test/functional/ex_cmds/profile_spec.lua
@@ -1,5 +1,5 @@
 require('os')
-local lfs = require('lfs')
+local luv = require('luv')
 
 local helpers  = require('test.functional.helpers')(after_each)
 local eval     = helpers.eval
@@ -12,25 +12,24 @@ local read_file = helpers.read_file
 
 -- tmpname() also creates the file on POSIX systems. Remove it again.
 -- We just need the name, ignoring any race conditions.
-if lfs.attributes(tempfile, 'uid') then
+if luv.fs_stat(tempfile).uid then
   os.remove(tempfile)
 end
 
 local function assert_file_exists(filepath)
-  -- Use 2-argument lfs.attributes() so no extra table gets created.
-  -- We don't really care for the uid.
-  neq(nil, lfs.attributes(filepath, 'uid'))
+  neq(nil, luv.fs_stat(filepath).uid)
 end
 
 local function assert_file_exists_not(filepath)
-  eq(nil, lfs.attributes(filepath, 'uid'))
+  eq(nil, luv.fs_stat(filepath))
 end
 
 describe(':profile', function()
   before_each(helpers.clear)
 
   after_each(function()
-    if lfs.attributes(tempfile, 'uid') ~= nil then
+    helpers.expect_exit(command, 'qall!')
+    if luv.fs_stat(tempfile).uid ~= nil then
       os.remove(tempfile)
     end
   end)