[main]

marcwimmer · Oct 9, 2024 · 1556a44 · 1556a44
1 parent 0f27536
commit 1556a44
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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