Merge with main

asavchkov · asavchkov · commit deebb59f3092 · 2024-06-13T17:05:02.000+07:00
diff --git a/setup.py b/setup.py
@@ -27,7 +27,7 @@
     readme = f.read()
 
 setup(
-    version='1.10.2',
+    version='1.10.0',
     name='testgres',
     packages=['testgres', 'testgres.operations', 'testgres.helpers'],
     description='Testing utility for PostgreSQL and its extensions',
diff --git a/testgres/node.py b/testgres/node.py
@@ -1641,7 +1641,7 @@ def set_auto_conf(self, options, config='postgresql.auto.conf', rm_options={}):
 
         self.os_ops.write(path, auto_conf, truncate=True)
 
-    def upgrade_from(self, old_node):
+    def upgrade_from(self, old_node, options=None):
         """
         Upgrade this node from an old node using pg_upgrade.
 
@@ -1654,6 +1654,9 @@ def upgrade_from(self, old_node):
         if not os.path.exists(self.data_dir):
             self.init()
 
+        if not options:
+            options = []
+
         pg_upgrade_binary = self._get_bin_path("pg_upgrade")
 
         if not os.path.exists(pg_upgrade_binary):
@@ -1668,6 +1671,7 @@ def upgrade_from(self, old_node):
             "--old-port", str(old_node.port),
             "--new-port", str(self.port),
         ]
+        upgrade_command += options
 
         return self.os_ops.exec_command(upgrade_command)
 
diff --git a/testgres/operations/remote_ops.py b/testgres/operations/remote_ops.py
@@ -3,7 +3,10 @@
 import subprocess
 import tempfile
 import platform
+<<<<<<< HEAD
 import time
+=======
+>>>>>>> master
 
 # we support both pg8000 and psycopg2
 try:
diff --git a/testgres/plugins/pg_probackup2/pg_probackup2/app.py b/testgres/plugins/pg_probackup2/pg_probackup2/app.py
@@ -56,6 +56,7 @@ def __init__(self, test_class: unittest.TestCase,
         self.verbose = init_params.verbose
         self.archive_compress = init_params.archive_compress
         self.test_class.output = None
+        self.execution_time = None
 
     def run(self, command, gdb=False, old_binary=False, return_id=True, env=None,
             skip_log_directory=False, expect_error=False, use_backup_dir=True):
@@ -113,16 +114,17 @@ def run(self, command, gdb=False, old_binary=False, return_id=True, env=None,
                 cmdline = ['gdbserver'] + ['localhost:' + str(gdb_port)] + cmdline
                 print("pg_probackup gdb suspended, waiting gdb connection on localhost:{0}".format(gdb_port))
 
+            start_time = time.time()
             self.test_class.output = subprocess.check_output(
                 cmdline,
                 stderr=subprocess.STDOUT,
                 env=env
             ).decode('utf-8', errors='replace')
+            end_time = time.time()
+            self.execution_time = end_time - start_time
+
             if command[0] == 'backup' and return_id:
-                # return backup ID
-                for line in self.test_class.output.splitlines():
-                    if 'INFO: Backup' and 'completed' in line:
-                        result = line.split()[2]
+                result = self.get_backup_id()
             else:
                 result = self.test_class.output
             if expect_error is True:
@@ -139,6 +141,19 @@ def run(self, command, gdb=False, old_binary=False, return_id=True, env=None,
             else:
                 raise ProbackupException(self.test_class.output, self.test_class.cmd)
 
+    def get_backup_id(self):
+        if init_params.major_version > 2:
+            pattern = re.compile(r"Backup (.*) completed successfully.")
+            for line in self.test_class.output.splitlines():
+                match = pattern.search(line)
+                if match:
+                    return match.group(1)
+        else:
+            for line in self.test_class.output.splitlines():
+                if 'INFO: Backup' and 'completed' in line:
+                    return line.split()[2]
+        return 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 = []
