PBCKP-152 fixed test_simple and test_remote

Author: v.shepard

setup.py

@@ -13,7 +13,8 @@
     "psutil",
     "packaging",
     "paramiko",
-    "fabric"
+    "fabric",
+    "sshtunnel"
 ]
 
 # Add compatibility enum class

testgres/backup.py

@@ -77,7 +77,7 @@ def __init__(self,
             "-D", data_dir,
             "-X", xlog_method.value
         ]  # yapf: disable
-        execute_utility(_params, self.log_file, self.os_ops)
+        execute_utility(_params, self.log_file)
 
     def __enter__(self):
         return self
@@ -139,7 +139,7 @@ def spawn_primary(self, name=None, destroy=True):
 
         # Build a new PostgresNode
         NodeClass = self.original_node.__class__
-        with clean_on_error(NodeClass(name=name, base_dir=base_dir)) as node:
+        with clean_on_error(NodeClass(name=name, base_dir=base_dir, os_ops=self.original_node.os_ops)) as node:
 
             # New nodes should always remove dir tree
             node._should_rm_dirs = True

testgres/cache.py

@@ -26,12 +26,11 @@ def cached_initdb(data_dir, logfile=None, params=None, os_ops: OsOperations = Lo
     """
     Perform initdb or use cached node files.
     """
-    testgres_config.os_ops = os_ops
 
-    def call_initdb(initdb_dir, log=None):
+    def call_initdb(initdb_dir, log=logfile):
         try:
             _params = [get_bin_path("initdb"), "-D", initdb_dir, "-N"]
-            execute_utility(_params + (params or []), log, os_ops)
+            execute_utility(_params + (params or []), log)
         except ExecUtilException as e:
             raise_from(InitNodeException("Failed to run initdb"), e)
 
@@ -62,7 +61,7 @@ def call_initdb(initdb_dir, log=None):
 
                 # XXX: build new WAL segment with our system id
                 _params = [get_bin_path("pg_resetwal"), "-D", data_dir, "-f"]
-                execute_utility(_params, logfile, os_ops=os_ops)
+                execute_utility(_params, logfile)
 
         except ExecUtilException as e:
             msg = "Failed to reset WAL for system id"

testgres/config.py

@@ -7,6 +7,7 @@
 from contextlib import contextmanager
 
 from .consts import TMP_CACHE
+from .operations.os_ops import OsOperations
 from .operations.local_ops import LocalOperations
 
 
@@ -121,6 +122,11 @@ def copy(self):
 
         return copy.copy(self)
 
+    @staticmethod
+    def set_os_ops(os_ops: OsOperations):
+        testgres_config.os_ops = os_ops
+        testgres_config.cached_initdb_dir = os_ops.mkdtemp(prefix=TMP_CACHE)
+
 
 # cached dirs to be removed
 cached_initdb_dirs = set()

testgres/connection.py

@@ -37,7 +37,7 @@ def __init__(self,
 
         # Set default arguments
         dbname = dbname or default_dbname()
-        username = username or default_username(node.os_ops)
+        username = username or default_username()
 
         self._node = node
 

testgres/defaults.py

@@ -2,7 +2,7 @@
 import struct
 import uuid
 
-from .operations.local_ops import LocalOperations
+from .config import testgres_config as tconf
 
 
 def default_dbname():
@@ -13,11 +13,11 @@ def default_dbname():
     return 'postgres'
 
 
-def default_username(os_ops=LocalOperations()):
+def default_username():
     """
     Return default username (current user).
     """
-    return os_ops.get_user()
+    return tconf.os_ops.get_user()
 
 
 def generate_app_name():
@@ -28,7 +28,7 @@ def generate_app_name():
     return 'testgres-{}'.format(str(uuid.uuid4()))
 
 
-def generate_system_id(os_ops=LocalOperations()):
+def generate_system_id():
     """
     Generate a new 64-bit unique system identifier for node.
     """
@@ -43,7 +43,7 @@ def generate_system_id(os_ops=LocalOperations()):
     system_id = 0
     system_id |= (secs << 32)
     system_id |= (usecs << 12)
-    system_id |= (os_ops.get_pid() & 0xFFF)
+    system_id |= (tconf.os_ops.get_pid() & 0xFFF)
 
     # pack ULL in native byte order
     return struct.pack('=Q', system_id)

testgres/logger.py

@@ -5,19 +5,20 @@
 import threading
 import time
 
-
 # create logger
 log = logging.getLogger('Testgres')
-log.setLevel(logging.DEBUG)
-# create console handler and set level to debug
-ch = logging.StreamHandler()
-ch.setLevel(logging.DEBUG)
-# create formatter
-formatter = logging.Formatter('\n%(asctime)s - %(name)s[%(levelname)s]: %(message)s')
-# add formatter to ch
-ch.setFormatter(formatter)
-# add ch to logger
-log.addHandler(ch)
+
+if not log.handlers:
+    log.setLevel(logging.WARN)
+    # create console handler and set level to debug
+    ch = logging.StreamHandler()
+    ch.setLevel(logging.WARN)
+    # create formatter
+    formatter = logging.Formatter('\n%(asctime)s - %(name)s[%(levelname)s]: %(message)s')
+    # add formatter to ch
+    ch.setFormatter(formatter)
+    # add ch to logger
+    log.addHandler(ch)
 
 
 class TestgresLogger(threading.Thread):