Merge branch 'default-users' into multihost-catchup

Author: asavchkov

testgres/node.py

@@ -63,7 +63,6 @@
 
 from .defaults import \
     default_dbname, \
-    default_username, \
     generate_app_name
 
 from .exceptions import \
@@ -156,9 +155,8 @@ def __init__(self, name=None, port=None, base_dir=None, conn_params: ConnectionP
         else:
             self.os_ops = LocalOperations(conn_params)
 
-        self.port = port or reserve_port()
-
         self.host = self.os_ops.host
+        self.port = port or reserve_port()
         self.ssh_key = self.os_ops.ssh_key
 
         # defaults for __exit__()
@@ -685,8 +683,6 @@ def slow_start(self, replica=False, dbname='template1', username=None, max_attem
                         If False, waits for the instance to be in primary mode. Default is False.
                max_attempts:
         """
-        if not username:
-            username = default_username()
         self.start()
 
         if replica:
@@ -696,7 +692,7 @@ def slow_start(self, replica=False, dbname='template1', username=None, max_attem
         # Call poll_query_until until the expected value is returned
         self.poll_query_until(query=query,
                               dbname=dbname,
-                              username=username,
+                              username=username or self.os_ops.username,
                               suppress={InternalError,
                                         QueryException,
                                         ProgrammingError,
@@ -969,15 +965,13 @@ def psql(self,
             >>> psql(query='select 3', ON_ERROR_STOP=1)
         """
 
-        # Set default arguments
         dbname = dbname or default_dbname()
-        username = username or default_username()
 
         psql_params = [
             self._get_bin_path("psql"),
             "-p", str(self.port),
             "-h", self.host,
-            "-U", username,
+            "-U", username or self.os_ops.username,
             "-X",  # no .psqlrc
             "-A",  # unaligned output
             "-t",  # print rows only
@@ -1089,18 +1083,15 @@ def tmpfile():
                 fname = self.os_ops.mkstemp(prefix=TMP_DUMP)
             return fname
 
-        # Set default arguments
-        dbname = dbname or default_dbname()
-        username = username or default_username()
         filename = filename or tmpfile()
 
         _params = [
             self._get_bin_path("pg_dump"),
             "-p", str(self.port),
             "-h", self.host,
             "-f", filename,
-            "-U", username,
-            "-d", dbname,
+            "-U", username or self.os_ops.username,
+            "-d", dbname or default_dbname(),
             "-F", format.value
         ]  # yapf: disable
 
@@ -1120,7 +1111,7 @@ def restore(self, filename, dbname=None, username=None):
 
         # Set default arguments
         dbname = dbname or default_dbname()
-        username = username or default_username()
+        username = username or self.os_ops.username
 
         _params = [
             self._get_bin_path("pg_restore"),
@@ -1390,15 +1381,13 @@ def pgbench(self,
         if options is None:
             options = []
 
-        # Set default arguments
         dbname = dbname or default_dbname()
-        username = username or default_username()
 
         _params = [
             self._get_bin_path("pgbench"),
             "-p", str(self.port),
             "-h", self.host,
-            "-U", username,
+            "-U", username or self.os_ops.username
         ] + options  # yapf: disable
 
         # should be the last one
@@ -1465,15 +1454,13 @@ def pgbench_run(self, dbname=None, username=None, options=[], **kwargs):
             >>> pgbench_run(time=10)
         """
 
-        # Set default arguments
         dbname = dbname or default_dbname()
-        username = username or default_username()
 
         _params = [
             self._get_bin_path("pgbench"),
             "-p", str(self.port),
             "-h", self.host,
-            "-U", username,
+            "-U", username or self.os_ops.username
         ] + options  # yapf: disable
 
         for key, value in iteritems(kwargs):

testgres/operations/local_ops.py

@@ -38,7 +38,7 @@ 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()
+        self.username = conn_params.username or getpass.getuser()
 
     @staticmethod
     def _raise_exec_exception(message, command, exit_code, output):
@@ -130,10 +130,6 @@ def set_env(self, var_name, var_val):
         # Check if the directory is already in PATH
         os.environ[var_name] = var_val
 
-    # Get environment variables
-    def get_user(self):
-        return self.username or getpass.getuser()
-
     def get_name(self):
         return os.name
 

testgres/operations/os_ops.py

@@ -1,3 +1,4 @@
+import getpass
 import locale
 
 try:
@@ -24,7 +25,7 @@ def get_default_encoding():
 class OsOperations:
     def __init__(self, username=None):
         self.ssh_key = None
-        self.username = username
+        self.username = username or getpass.getuser()
 
     # Command execution
     def exec_command(self, cmd, **kwargs):
@@ -45,9 +46,8 @@ def set_env(self, var_name, var_val):
         # Check if the directory is already in PATH
         raise NotImplementedError()
 
-    # Get environment variables
     def get_user(self):
-        raise NotImplementedError()
+        return self.username
 
     def get_name(self):
         raise NotImplementedError()

testgres/operations/remote_ops.py

@@ -1,3 +1,4 @@
+import getpass
 import os
 import socket
 import subprocess
@@ -52,8 +53,8 @@ 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.username = conn_params.username or getpass.getuser()
+        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