Refactor the node username

asavchkov · asavchkov · commit 154d000761e1 · 2024-06-15T22:17:09.000+07:00
diff --git a/testgres/node.py b/testgres/node.py
@@ -158,8 +158,7 @@ def __init__(self, name=None, port=None, base_dir=None, conn_params: ConnectionP
 
         self.host = self.os_ops.host
         self.port = port or reserve_port()
-        # Default node username
-        self.username = default_username()
+        self.username = self.os_ops.username
         self.ssh_key = self.os_ops.ssh_key
 
         # defaults for __exit__()
diff --git a/testgres/operations/local_ops.py b/testgres/operations/local_ops.py
@@ -38,7 +38,6 @@ def __init__(self, conn_params=None):
         self.host = conn_params.host
         self.ssh_key = None
         self.remote = False
-        self.username = conn_params.username or self.get_user()
 
     @staticmethod
     def _raise_exec_exception(message, command, exit_code, output):
diff --git a/testgres/operations/os_ops.py b/testgres/operations/os_ops.py
@@ -24,7 +24,7 @@ def get_default_encoding():
 class OsOperations:
     def __init__(self, username=None):
         self.ssh_key = None
-        self.username = username
+        self.username = username or self.get_user()
 
     # Command execution
     def exec_command(self, cmd, **kwargs):
diff --git a/testgres/operations/remote_ops.py b/testgres/operations/remote_ops.py
@@ -52,8 +52,7 @@ def __init__(self, conn_params: ConnectionParams):
         if self.port:
             self.ssh_args += ["-p", self.port]
         self.remote = True
-        self.username = conn_params.username
-        self.ssh_dest = f"{self.username}@{self.host}" if self.username else self.host
+        self.ssh_dest = f"{self.username}@{self.host}" if conn_params.username else self.host
         self.add_known_host(self.host)
         self.tunnel_process = None
         self.tunnel_port = None
