From 00d6dfcde573c380a4cd666e3655e8cd549a2924 Mon Sep 17 00:00:00 2001
From: Vladimir Davydov <vdavydov@tarantool.org>
Date: Fri, 6 May 2022 14:50:54 +0300
Subject: [PATCH] test: fix luatest server cleanup
It doesn't work, because fio.rmtree doesn't accept wildcards.
Let's delete the whole server working tree on cleanup.
NO_DOC=test
NO_CHANGELOG=test
---
test/luatest_helpers/server.lua | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/test/luatest_helpers/server.lua b/test/luatest_helpers/server.lua
index d1828ec442..de59def07a 100644
--- a/test/luatest_helpers/server.lua
+++ b/test/luatest_helpers/server.lua
@@ -21,9 +21,6 @@ local Server = luatest.Server:inherit({})
local WAIT_TIMEOUT = 60
local WAIT_DELAY = 0.1
-local DEFAULT_CHECKPOINT_PATTERNS = {"*.snap", "*.xlog", "*.vylog",
- "*.inprogress", "[0-9]*/"}
-
-- Differences from luatest.Server:
--
-- * 'alias' is mandatory.
@@ -223,9 +220,7 @@ function Server:stop()
end
function Server:cleanup()
- for _, pattern in ipairs(DEFAULT_CHECKPOINT_PATTERNS) do
- fio.rmtree(('%s/%s'):format(self.workdir, pattern))
- end
+ fio.rmtree(self.workdir)
self.instance_id_value = nil
self.instance_uuid_value = nil
end
--
GitLab