PBCKP-152 test multihost - 3

Author: v.shepard

testgres/cache.py

@@ -10,7 +10,7 @@
 
 from .consts import XLOG_CONTROL_FILE
 
-from .defaults import generate_system_id
+from .defaults import generate_system_id, default_username
 
 from .exceptions import \
     InitNodeException, \
@@ -21,7 +21,7 @@
     execute_utility
 
 
-def cached_initdb(data_dir, logfile=None, host='localhost', ssh_key=None, user='dev', params=None):
+def cached_initdb(data_dir, logfile=None, host='localhost', ssh_key=None, user=default_username(), params=None):
     """
     Perform initdb or use cached node files.
     """

testgres/connection.py

@@ -1,5 +1,5 @@
 from .enums import IsolationLevel
-from .defaults import default_dbname
+from .defaults import default_dbname, default_username
 from .exceptions import QueryException
 
 
@@ -20,7 +20,7 @@ class NodeConnection(object):
     def __init__(self, node, dbname=None, username=None, password=None, autocommit=False):
         # Set default arguments
         dbname = dbname or default_dbname()
-        username = username or 'dev'
+        username = username or default_username()
 
         self._node = node
         self._connection = pglib.connect(database=dbname, user=username, password=password,

testgres/node.py

@@ -112,7 +112,7 @@ def __repr__(self):
 
 class PostgresNode(object):
     def __init__(self, name=None, port=None, base_dir=None,
-                 host='locahost', ssh_key=None, username='dev'):
+                 host='locahost', ssh_key=None, username=default_username()):
         """
         PostgresNode constructor.
 
@@ -487,6 +487,7 @@ def get_auth_method(t):
             auth_host = get_auth_method('host')
 
             new_lines = [
+                "local\tall\tall\t\t\ttrust\n",
                 u"local\treplication\tall\t\t\t{}\n".format(auth_local),
                 u"host\treplication\tall\t127.0.0.1/32\t{}\n".format(auth_host),
 
@@ -496,15 +497,15 @@ def get_auth_method(t):
                 u"host\treplication\tall\t::1/128\t\t{}\n".format(auth_host)
             ]  # yapf: disable
 
-            self.os_ops.write(hba_conf, '\n'.join(new_lines), truncate=True)
+            self.os_ops.write(hba_conf, ''.join(new_lines), truncate=True)
 
         # overwrite config file
         self.os_ops.write(postgres_conf, "", truncate=True)
 
         self.append_conf(fsync=fsync,
                          max_worker_processes=MAX_WORKER_PROCESSES,
                          log_statement=log_statement,
-                         listen_addresses="'*'",
+                         listen_addresses='*',
                          port=self.port)  # yapf:disable
 
         # common replication settings
@@ -825,7 +826,7 @@ def psql(self,
              query=None,
              filename=None,
              dbname=None,
-             username='dev',
+             username=default_username(),
              input=None,
              **variables):
         """

testgres/os_ops.py

@@ -1,15 +1,16 @@
 import os
-from distutils.spawn import find_executable
 import subprocess
 from contextlib import contextmanager
+
+from defaults import default_username
 from testgres.logger import log
 
 import paramiko
 
 
 class OsOperations:
 
-    def __init__(self, host, ssh_key=None, username='dev'):
+    def __init__(self, host, ssh_key=None, username=default_username()):
         self.host = host
         self.ssh_key = ssh_key
         self.username = username
@@ -49,9 +50,9 @@ def exec_command(self, cmd, wait_exit=False, verbose=False):
             cmd = ' '.join(cmd)
         log.debug(f"os_ops.exec_command: `{cmd}`; remote={self.remote}")
         # Source global profile file + execute command
-        cmd = f"source /etc/profile.d/custom.sh; {cmd}"
         try:
             if self.remote:
+                cmd = f"source /etc/profile.d/custom.sh; {cmd}"
                 with self.ssh_connect() as ssh:
                     stdin, stdout, stderr = ssh.exec_command(cmd)
                     exit_status = 0
@@ -60,15 +61,15 @@ def exec_command(self, cmd, wait_exit=False, verbose=False):
                     result = stdout.read().decode('utf-8')
                     error = stderr.read().decode('utf-8')
             else:
-                process = subprocess.run(cmd, shell=True, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                process = subprocess.run(cmd, shell=True, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                                         timeout=60)
                 exit_status = process.returncode
                 result = process.stdout
                 error = process.stderr
 
-            if exit_status != 0 or error != '':
-                log.error(f"Problem in executing command: `{cmd}`;\nerror: `{error}`;\nexit_code: {exit_status}")
-                if 'error' in error.lower():
-                    exit(1)
+            if exit_status != 0 or 'error' in error.lower():
+                log.error(f"Problem in executing command: `{cmd}`\nerror: {error}\nexit_code: {exit_status}")
+                exit(1)
 
             if verbose:
                 return exit_status, result, error
@@ -131,20 +132,17 @@ def isfile(self, remote_file):
             return os.path.isfile(remote_file)
 
     def find_executable(self, executable):
-        if self.remote:
-            search_paths = self.environ('PATH')
-            if not search_paths:
-                return None
+        search_paths = self.environ('PATH')
+        if not search_paths:
+            return None
 
-            search_paths = search_paths.split(self.pathsep)
-            for path in search_paths:
-                remote_file = os.path.join(path, executable)
-                if self.isfile(remote_file):
-                    return remote_file
+        search_paths = search_paths.split(self.pathsep)
+        for path in search_paths:
+            remote_file = os.path.join(path, executable)
+            if self.isfile(remote_file):
+                return remote_file
 
-            return None
-        else:
-            return find_executable(executable)
+        return None
 
     def is_executable(self, file):
         # Check if the file is executable

testgres/utils.py

@@ -14,6 +14,7 @@
 from packaging.version import Version
 from six import iteritems
 
+from defaults import default_username
 from .os_ops import OsOperations
 from .config import testgres_config
 from .exceptions import ExecUtilException
@@ -47,7 +48,7 @@ def release_port(port):
     bound_ports.discard(port)
 
 
-def execute_utility(args, logfile=None, host='localhost', ssh_key=None, user='dev', wait_exit=False):
+def execute_utility(args, logfile=None, host='localhost', ssh_key=None, user=default_username(), wait_exit=False):
     """
     Execute utility wrapper (pg_ctl, pg_dump etc).