Add cleanup parameter - clean full dir

vshepard · vshepard · commit e5184a416622 · 2024-07-01T11:55:14.000+02:00
diff --git a/testgres/node.py b/testgres/node.py
@@ -912,13 +912,14 @@ def free_port(self):
             self._should_free_port = False
             release_port(self.port)
 
-    def cleanup(self, max_attempts=3):
+    def cleanup(self, max_attempts=3, full=False):
         """
         Stop node if needed and remove its data/logs directory.
         NOTE: take a look at TestgresConfig.node_cleanup_full.
 
         Args:
             max_attempts: how many times should we try to stop()?
+            full: clean full base dir
 
         Returns:
             This instance of :class:`.PostgresNode`.
@@ -927,7 +928,7 @@ def cleanup(self, max_attempts=3):
         self._try_shutdown(max_attempts)
 
         # choose directory to be removed
-        if testgres_config.node_cleanup_full:
+        if testgres_config.node_cleanup_full or full:
             rm_dir = self.base_dir    # everything
         else:
             rm_dir = self.data_dir    # just data, save logs
@@ -1655,8 +1656,7 @@ def upgrade_from(self, old_node, options=None, expect_error=False):
             "--old-datadir", old_node.data_dir,
             "--new-datadir", self.data_dir,
             "--old-port", str(old_node.port),
-            "--new-port", str(self.port),
-            "--copy"
+            "--new-port", str(self.port)
         ]
         upgrade_command += options
 
diff --git a/testgres/operations/local_ops.py b/testgres/operations/local_ops.py
@@ -162,6 +162,8 @@ def rmdirs(self, path, ignore_errors=True, retries=3, delay=1):
                 rmtree(path, ignore_errors=ignore_errors)
                 if not os.path.exists(path):
                     return True
+            except FileNotFoundError:
+                return True
             except Exception as e:
                 print(f"Error: Failed to remove directory {path} on attempt {attempt + 1}: {e}")
             time.sleep(delay)
