Revert "Skip cleanup of custom directory was provided"

alubennikova · alubennikova · commit a3f6dd320529 · 2020-10-20T14:25:34.000+03:00
Per perort in [issue #57]: cleanup backward compatibility broken in 1.8.3. If this feature is needed, feel free to bring it back, but maintain compatibility. This reverts commit cdc933f.
diff --git a/testgres/node.py b/testgres/node.py
@@ -119,12 +119,10 @@ def __init__(self, name=None, port=None, base_dir=None):
         # private
         self._pg_version = PgVer(get_pg_version())
         self._should_free_port = port is None
+        self._base_dir = base_dir
         self._logger = None
         self._master = None
 
-        self._custom_base_dir = base_dir
-        self._base_dir = base_dir
-
         # basic
         self.host = '127.0.0.1'
         self.name = name or generate_app_name()
@@ -817,13 +815,11 @@ def cleanup(self, max_attempts=3):
 
         self._try_shutdown(max_attempts)
 
-        # only remove if base directory was temporary
-        if not self._custom_base_dir:
-            # choose directory to be removed
-            if testgres_config.node_cleanup_full:
-                rm_dir = self.base_dir    # everything
-            else:
-                rm_dir = self.data_dir    # just data, save logs
+        # choose directory to be removed
+        if testgres_config.node_cleanup_full:
+            rm_dir = self.base_dir    # everything
+        else:
+            rm_dir = self.data_dir    # just data, save logs
 
             rmtree(rm_dir, ignore_errors=True)
 
