PostgresNode::cleanup is fixed

dmitry-lipetsk · dmitry-lipetsk · commit 84a51c7c23b6 · 2025-03-17T10:37:51.000+03:00
The problems on Probackup's CFS test are detected.

Parameter 'full' must be respected!
diff --git a/testgres/node.py b/testgres/node.py
@@ -184,15 +184,30 @@ def pg_log_name(self):
         return self.pg_log_file
 
     def cleanup(self, max_attempts=3, full=False):
-        super().cleanup(max_attempts, full)
+        assert type(max_attempts) == int
+        assert type(full) == bool
+        assert max_attempts > 0
+
+        super().cleanup(max_attempts=max_attempts, full=full)
+
+        if testgres_config.node_cleanup_full:
+            # Remove all
+            pass
+        elif full:
+            # Remove all
+            pass
+        else:
+            assert not full
+            assert not testgres_config.node_cleanup_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
+            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)
+            if len(base_dir_items) != 0:
+                return
 
+        self.os_ops.rmdirs(self.base_dir, ignore_errors=False)
         return self
 
 
