Add port to scp command

vshepard · vshepard · commit d08325bec626 · 2024-06-06T07:52:16.000+02:00
diff --git a/testgres/operations/remote_ops.py b/testgres/operations/remote_ops.py
@@ -285,8 +285,10 @@ def write(self, filename, data, truncate=False, binary=False, read_and_write=Fal
             mode = "r+b" if binary else "r+"
 
         with tempfile.NamedTemporaryFile(mode=mode, delete=False) as tmp_file:
+            scp_ssh_cmd = ['-P' if x == '-p' else x for x in self.ssh_cmd]
+
             if not truncate:
-                scp_cmd = ['scp'] + self.ssh_cmd + [f"{self.username}@{self.host}:{filename}", tmp_file.name]
+                scp_cmd = ['scp'] + scp_ssh_cmd + [f"{self.username}@{self.host}:{filename}", tmp_file.name]
                 subprocess.run(scp_cmd, check=False)  # The file might not exist yet
                 tmp_file.seek(0, os.SEEK_END)
 
@@ -302,11 +304,12 @@ def write(self, filename, data, truncate=False, binary=False, read_and_write=Fal
                 tmp_file.write(data)
 
             tmp_file.flush()
-            scp_cmd = ['scp'] + self.ssh_cmd + [tmp_file.name, f"{self.username}@{self.host}:{filename}"]
+            # Because in scp we set up port using -P option
+            scp_cmd = ['scp'] + scp_ssh_cmd + [tmp_file.name, f"{self.username}@{self.host}:{filename}"]
             subprocess.run(scp_cmd, check=True)
 
             remote_directory = os.path.dirname(filename)
-            mkdir_cmd = ['ssh'] + self.ssh_cmd + [f"{self.username}@{self.host}", f"mkdir -p {remote_directory}"]
+            mkdir_cmd = ['ssh'] + scp_ssh_cmd + [f"{self.username}@{self.host}", f"mkdir -p {remote_directory}"]
             subprocess.run(mkdir_cmd, check=True)
 
             os.remove(tmp_file.name)
diff --git a/testgres/utils.py b/testgres/utils.py
@@ -74,8 +74,6 @@ def execute_utility(args, logfile=None, verbose=False):
 
     # write new log entry if possible
     if logfile:
-        if not tconf.os_ops.path_exists(logfile):
-            tconf.os_ops.touch(logfile)
         try:
             tconf.os_ops.write(filename=logfile, data=args, truncate=True)
             if out:
