More merge fixes

Author: asavchkov

testgres/operations/remote_ops.py

@@ -3,10 +3,6 @@
 import subprocess
 import tempfile
 import platform
-<<<<<<< HEAD
-import time
-=======
->>>>>>> master
 
 # we support both pg8000 and psycopg2
 try:
@@ -57,11 +53,8 @@ def __init__(self, conn_params: ConnectionParams):
             self.ssh_cmd += ["-p", self.port]
         self.remote = True
         self.username = conn_params.username or self.get_user()
-<<<<<<< HEAD
-=======
         self.ssh_dest = f"{self.username}@{self.host}" if self.username else "{self.host}"
         self.add_known_host(self.host)
->>>>>>> default-ssh-user
         self.tunnel_process = None
         self.tunnel_port = None
 
@@ -251,15 +244,9 @@ def mkdtemp(self, prefix=None):
         - prefix (str): The prefix of the temporary directory name.
         """
         if prefix:
-<<<<<<< HEAD
-            command = ["ssh" +  f"{self.username}@{self.host}"] + self.ssh_cmd + [f"mktemp -d {prefix}XXXXX"]
-        else:
-            command = ["ssh", f"{self.username}@{self.host}"] + self.ssh_cmd + ["mktemp -d"]
-=======
             command = ["ssh"] + self.ssh_cmd + [self.ssh_dest, f"mktemp -d {prefix}XXXXX"]
         else:
             command = ["ssh"] + self.ssh_cmd + [self.ssh_dest, "mktemp -d"]
->>>>>>> default-ssh-user
 
         result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
 
@@ -306,11 +293,7 @@ def write(self, filename, data, truncate=False, binary=False, read_and_write=Fal
             scp_ssh_cmd = ['-P' if x == '-p' else x for x in self.ssh_cmd]
 
             if not truncate:
-<<<<<<< HEAD
-                scp_cmd = ['scp'] + scp_ssh_cmd + [f"{self.username}@{self.host}:{filename}", tmp_file.name]
-=======
                 scp_cmd = ['scp'] + self.ssh_cmd + [f"{self.ssh_dest}:{filename}", tmp_file.name]
->>>>>>> default-ssh-user
                 subprocess.run(scp_cmd, check=False)  # The file might not exist yet
                 tmp_file.seek(0, os.SEEK_END)
 
@@ -326,19 +309,11 @@ def write(self, filename, data, truncate=False, binary=False, read_and_write=Fal
                 tmp_file.write(data)
 
             tmp_file.flush()
-<<<<<<< HEAD
-            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', f"{self.username}@{self.host}"] + self.ssh_cmd + [f"mkdir -p {remote_directory}"]
-=======
             scp_cmd = ['scp'] + self.ssh_cmd + [tmp_file.name, f"{self.ssh_dest}:{filename}"]
             subprocess.run(scp_cmd, check=True)
 
             remote_directory = os.path.dirname(filename)
             mkdir_cmd = ['ssh'] + self.ssh_cmd + [self.ssh_dest, f"mkdir -p {remote_directory}"]
->>>>>>> default-ssh-user
             subprocess.run(mkdir_cmd, check=True)
 
             os.remove(tmp_file.name)