Merge branch 'default-users' into multihost-catchup

asavchkov · asavchkov · commit a1a475a55792 · 2024-06-17T18:34:39.000+07:00
diff --git a/testgres/plugins/pg_probackup2/pg_probackup2/app.py b/testgres/plugins/pg_probackup2/pg_probackup2/app.py
@@ -388,6 +388,7 @@ def catchup_node(
             backup_mode, source_pgdata, destination_node,
             options=None,
             remote_host='localhost',
+            remote_port=None,
             expect_error=False,
             gdb=False
     ):
@@ -401,7 +402,9 @@ def catchup_node(
             '--destination-pgdata={0}'.format(destination_node.data_dir)
         ]
         if self.remote:
-            cmd_list += ['--remote-proto=ssh', '--remote-host=%s' % remote_host]
+            cmd_list += [f'--remote-proto=ssh', '--remote-host={remote_host}']
+            if remote_port:
+                cmd_list.append(f'--remote-port={remote_port}')
         if self.verbose:
             cmd_list += [
                 '--log-level-file=VERBOSE',
