PostgresNode::clean is corrected

PostgresNode_Base::clean deletes data_dir and logs_dir PostgresNode::clean calls PostgresNode_Base::clean and deletes base_dir.
postgrespro · dmitry-lipetsk · Mar 16, 2025 · Mar 16, 2025 · Mar 17, 2025 · Mar 17, 2025
commit 9e1979f3b7818d38778f1094e2314cfd0718835a
diff --git a/testgres/node.py b/testgres/node.py
@@ -186,6 +186,18 @@ def utils_log_name(self):
     def pg_log_name(self):
         return self.pg_log_file
 
+    def cleanup(self, max_attempts=3, full=False):
+        super().cleanup(max_attempts, full)
+
+        base_dir_items = self.os_ops.listdir(self.base_dir)
+        assert base_dir_items is not None
+        assert type(base_dir_items) == list  # noqa: E721
+
+        if len(base_dir_items) == 0:
+            self.os_ops.rmdirs(self.base_dir, ignore_errors=False)
+
+        return self
+
 
 class NodeApp:
 

diff --git a/testgres/node_base.py b/testgres/node_base.py
@@ -1170,22 +1170,18 @@ def cleanup(self, max_attempts=3, full=False):
 
         Args:
             max_attempts: how many times should we try to stop()?
-            full: clean full base dir
+            full: clean logs dir, too.
 
         Returns:
             This instance of :class:`.PostgresNode_Base`.
         """
 
         self._try_shutdown(max_attempts)
 
-        # choose directory to be removed
         if testgres_config.node_cleanup_full or full:
-            rm_dir = self.base_dir    # everything
-        else:
-            rm_dir = self.data_dir    # just data, save logs
-
-        self._os_ops.rmdirs(rm_dir, ignore_errors=False)
+            self._os_ops.rmdirs(self.logs_dir, ignore_errors=False)
 
+        self._os_ops.rmdirs(self.data_dir, ignore_errors=False)
         return self
 
     @method_decorator(positional_args_hack(['dbname', 'query']))