Test of probackup plugin is restored

dmitry-lipetsk · dmitry-lipetsk · commit 47a51a82b257 · 2025-02-25T12:32:35.000+03:00
It works now (was runned with a fresh probackup2 and vanilla 18devel).
diff --git a/testgres/plugins/__init__.py b/testgres/plugins/__init__.py
@@ -1,7 +1,7 @@
-from pg_probackup2.gdb import GDBobj
-from pg_probackup2.app import ProbackupApp, ProbackupException
-from pg_probackup2.init_helpers import init_params
-from pg_probackup2.storage.fs_backup import FSTestBackupDir
+from .pg_probackup2.pg_probackup2.gdb import GDBobj
+from .pg_probackup2.pg_probackup2.app import ProbackupApp, ProbackupException
+from .pg_probackup2.pg_probackup2.init_helpers import init_params
+from .pg_probackup2.pg_probackup2.storage.fs_backup import FSTestBackupDir
 
 __all__ = [
     "ProbackupApp", "ProbackupException", "init_params", "FSTestBackupDir", "GDBobj"
diff --git a/testgres/plugins/pg_probackup2/pg_probackup2/tests/__init__.py b/testgres/plugins/pg_probackup2/pg_probackup2/tests/__init__.py
diff --git a/testgres/plugins/pg_probackup2/pg_probackup2/tests/basic_test.py b/testgres/plugins/pg_probackup2/pg_probackup2/tests/basic_test.py
@@ -2,10 +2,10 @@
 import os
 import shutil
 import unittest
-import testgres
-from pg_probackup2.app import ProbackupApp
-from pg_probackup2.init_helpers import Init, init_params
-from pg_probackup2.app import build_backup_dir
+from ...... import testgres
+from ...pg_probackup2.app import ProbackupApp
+from ...pg_probackup2.init_helpers import Init, init_params
+from ..storage.fs_backup import FSTestBackupDir
 
 
 class TestUtils:
@@ -37,11 +37,11 @@ def setup_test_environment(self):
     def setup_test_paths(self):
         self.rel_path = os.path.join(self.module_name, self.fname)
         self.test_path = os.path.join(init_params.tmp_path, self.rel_path)
-        os.makedirs(self.test_path)
+        os.makedirs(self.test_path, exist_ok=True)
         self.pb_log_path = os.path.join(self.test_path, "pb_log")
 
     def setup_backup_dir(self):
-        self.backup_dir = build_backup_dir(self, 'backup')
+        self.backup_dir = self.build_backup_dir('backup')
         self.backup_dir.cleanup()
 
     def setup_probackup(self):
@@ -53,6 +53,8 @@ def tearDown(self):
         if os.path.exists(self.test_path):
             shutil.rmtree(self.test_path)
 
+    def build_backup_dir(self, backup='backup'):
+        return FSTestBackupDir(rel_path=self.rel_path, backup=backup)
 
 class BasicTest(ProbackupTest):
     def test_full_backup(self):
