From 1556a4426e61b11e2a98291ae237993d839fbb7f Mon Sep 17 00:00:00 2001 From: "github-action@github.com" Date: Wed, 9 Oct 2024 09:49:05 +0200 Subject: [PATCH] [main] --- .github/workflows/pypi.yml | 1 + wodoo/lib_control.py | 2 +- wodoo/tests/test_wodoo.py | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 02dec360d..1f61d3657 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -73,6 +73,7 @@ jobs: $ODOOCMD setting DEVMODE=1 -R $ODOOCMD setting WODOO_VERSION=${LAST_STABLE_VERSION} $ODOOCMD build + $ODOOCMD kill || true $ODOOCMD -f db reset $ODOOCMD update crm $ODOOCMD down diff --git a/wodoo/lib_control.py b/wodoo/lib_control.py index ce1275cdd..98da86f64 100644 --- a/wodoo/lib_control.py +++ b/wodoo/lib_control.py @@ -89,7 +89,7 @@ def remove_volumes(ctx, config, dry_run): ensure_project_name(config) if not config.devmode: if not config.force: - abort("Please provide force option on non live systems") + abort("Please provide force option on non dev systems") if not config.use_docker: return subprocess.check_call(["sync"]) diff --git a/wodoo/tests/test_wodoo.py b/wodoo/tests/test_wodoo.py index 2bc9072e9..bc8ffae2e 100644 --- a/wodoo/tests/test_wodoo.py +++ b/wodoo/tests/test_wodoo.py @@ -31,7 +31,10 @@ def setup_method(self, method): def teardown_method(self, method): if self.path.exists(): - shutil.rmtree(self.path) + try: + shutil.rmtree(self.path) + except Exception: + pass # def test_smoke(self): # pass