From 564a053c552a164399cd0b879536bd4f68a02f44 Mon Sep 17 00:00:00 2001
From: Konstantin Belyavskiy <k.belyavskiy@tarantool.org>
Date: Mon, 16 Jul 2018 19:00:12 +0300
Subject: [PATCH] lua: fix fio.rmtree to work with non empty dirs
Fix 'fio.rmtree' to remove a non empty directories.
And update test.
Closes #3258
---
src/lua/fio.lua | 8 ++++++--
test/app/fio.result | 21 +++++++++++++++++++++
test/app/fio.test.lua | 8 ++++++++
3 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/lua/fio.lua b/src/lua/fio.lua
index 3fda6e5322..d5531c1542 100644
--- a/src/lua/fio.lua
+++ b/src/lua/fio.lua
@@ -382,8 +382,12 @@ fio.rmtree = function(path)
for i, f in ipairs(ls) do
local tmppath = fio.pathjoin(path, f)
local st = fio.stat(tmppath)
- if st and st:is_dir() then
- st, err = fio.rmtree(tmppath)
+ if st then
+ if st:is_dir() then
+ st, err = fio.rmtree(tmppath)
+ else
+ st, err = fio.unlink(tmppath)
+ end
if err ~= nil then
return nil, err
end
diff --git a/test/app/fio.result b/test/app/fio.result
index 6c4609855f..3f8d77e25f 100644
--- a/test/app/fio.result
+++ b/test/app/fio.result
@@ -413,6 +413,27 @@ fio.rmdir(dir2)
- false
- 'fio: No such file or directory'
...
+-- gh-3258 rmtree should remove directories with files
+fio.mktree('tmp2/tmp3/tmp4')
+---
+- true
+...
+fh = fio.open('tmp2/tmp3/tmp4/tmp.txt', {'O_RDWR', 'O_CREAT'})
+---
+...
+fh:close()
+---
+- true
+...
+fio.rmtree('tmp2')
+---
+- true
+...
+fio.stat('tmp2')
+---
+- null
+- 'fio: No such file or directory'
+...
fio.rmdir(tmpdir)
---
- true
diff --git a/test/app/fio.test.lua b/test/app/fio.test.lua
index 0850413d9b..c2c8e689b4 100644
--- a/test/app/fio.test.lua
+++ b/test/app/fio.test.lua
@@ -131,6 +131,14 @@ fio.rmdir(dir2)
{ fio.unlink(file1), fio.unlink(file2), fio.unlink(file3), fio.unlink(file4) }
{ fio.unlink(file1), fio.unlink(file2), fio.unlink(file3), fio.unlink(file4) }
+
+-- gh-3258 rmtree should remove directories with files
+fio.mktree('tmp2/tmp3/tmp4')
+fh = fio.open('tmp2/tmp3/tmp4/tmp.txt', {'O_RDWR', 'O_CREAT'})
+fh:close()
+fio.rmtree('tmp2')
+fio.stat('tmp2')
+
fio.rmdir(tmpdir)
fio.rmdir(tmpdir)
--
GitLab