Merge master

vshepard · vshepard · commit a6f88fd3949a · 2024-01-15T16:28:50.000+01:00
diff --git a/setup.py b/setup.py
@@ -27,7 +27,7 @@
     readme = f.read()
 
 setup(
-    version='1.9.4',
+    version='1.10.0',
     name='testgres',
     packages=['testgres', 'testgres.operations', 'testgres.helpers'],
     description='Testing utility for PostgreSQL and its extensions',
diff --git a/testgres/plugins/pg_probackup2/pg_probackup2/app.py b/testgres/plugins/pg_probackup2/pg_probackup2/app.py
@@ -4,9 +4,9 @@
 import subprocess
 import unittest
 
-from .init_helpers import init_params
 from .storage.fs_backup import TestBackupDir
 from .gdb import GDBobj
+from .init_helpers import init_params
 
 warning = """
 Wrong splint in show_pb
@@ -132,12 +132,14 @@ def run(self, command, gdb=False, old_binary=False, return_id=True, env=None,
     def init(self, options=None, old_binary=False, skip_log_directory=False, expect_error=False, use_backup_dir=True):
         if options is None:
             options = []
-        return self.run(['init', ] + options,
-                        old_binary=old_binary,
-                        skip_log_directory=skip_log_directory,
-                        expect_error=expect_error,
-                        use_backup_dir=use_backup_dir
-                        )
+        return self.run([
+                     'init',
+                 ] + options,
+                 old_binary=old_binary,
+                 skip_log_directory=skip_log_directory,
+                 expect_error=expect_error,
+                 use_backup_dir=use_backup_dir
+                 )
 
     def add_instance(self, instance, node, old_binary=False, options=None, expect_error=False):
         if options is None:
@@ -325,7 +327,10 @@ def restore_node(
         if options is None:
             options = []
         if node:
-            data_dir = node.data_dir
+            if isinstance(node, str):
+                data_dir = node
+            else:
+                data_dir = node.data_dir
         elif restore_dir:
             data_dir = self._node_dir(restore_dir)
         else:
@@ -533,6 +538,7 @@ def show_archive(
                         break
 
                 if tli > 0:
+                    timeline_data = None
                     for timeline in instance_timelines:
                         if timeline['tli'] == tli:
                             return timeline
@@ -661,7 +667,7 @@ def set_archiving(
                 archive_command += ' --remote-proto=ssh --remote-host=localhost'
 
             if init_params.archive_compress and compress:
-                archive_command += ' --compress-algorithm=' + init_params.archive_compress
+                archive_command += ' --compress-algorithm='+init_params.archive_compress
 
             if overwrite:
                 archive_command += ' --overwrite'
