Merge branch 'default-users' into multihost-catchup

asavchkov · asavchkov · commit 59a15f3416fc · 2024-06-22T08:24:00.000+07:00
diff --git a/testgres/plugins/pg_probackup2/pg_probackup2/app.py b/testgres/plugins/pg_probackup2/pg_probackup2/app.py
@@ -402,7 +402,7 @@ def catchup_node(
             '--destination-pgdata={0}'.format(destination_node.data_dir)
         ]
         if self.remote:
-            cmd_list += [f'--remote-proto=ssh', '--remote-host={remote_host}']
+            cmd_list += ['--remote-proto=ssh', f'--remote-host={remote_host}']
             if remote_port:
                 cmd_list.append(f'--remote-port={remote_port}')
         if self.verbose:

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ def catchup_node(`
`402`	`402`	`'--destination-pgdata={0}'.format(destination_node.data_dir)`
`403`	`403`	`]`
`404`	`404`	`if self.remote:`
`405`		`- cmd_list += [f'--remote-proto=ssh', '--remote-host={remote_host}']`
	`405`	`+ cmd_list += ['--remote-proto=ssh', f'--remote-host={remote_host}']`
`406`	`406`	`if remote_port:`
`407`	`407`	`cmd_list.append(f'--remote-port={remote_port}')`
`408`	`408`	`if self.verbose:`