From f02fe1ed910c42706c48f299a82f97f6fae213e5 Mon Sep 17 00:00:00 2001 From: florian Date: Thu, 14 Jul 2022 19:28:34 +0200 Subject: [PATCH] tests - remove only subdirectory on new tests and add cleanup when test failed --- tests/Test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Test.py b/tests/Test.py index 9b12550c1..e723667f5 100644 --- a/tests/Test.py +++ b/tests/Test.py @@ -50,7 +50,7 @@ class Test(ABC) : rm_dirs = ["configs", "plugins", "www"] for rm_dir in rm_dirs : if isdir("/tmp/bw-data/" + rm_dir) : - run("sudo rm -rf /tmp/bw-data/" + rm_dir, shell=True) + run("sudo rm -rf /tmp/bw-data/" + rm_dir + "/*", shell=True) if isdir("/tmp/tests/" + self._name) : run("sudo rm -rf /tmp/tests/" + self._name, shell=True) copytree("./examples/" + self._name, "/tmp/tests/" + self._name) @@ -86,6 +86,7 @@ class Test(ABC) : return self._cleanup_test() log("TEST", "⚠️", "tests not ok, retrying in 1s ...") sleep(1) + self._cleanup_test() self._debug_fail() log("TEST", "❌", "failed (timeout = " + str(self.__timeout) + "s)") return False