Remove using paramiko (#89)

* Remove using paramiko

* Up version 1.9.1

Author: demonolock

README.md

@@ -176,7 +176,7 @@ the configuration file, which means that they should be called before `append_co
 ### Remote mode
 Testgres supports the creation of PostgreSQL nodes on a remote host. This is useful when you want to run distributed tests involving multiple nodes spread across different machines.
 
-To use this feature, you need to use the RemoteOperations class.
+To use this feature, you need to use the RemoteOperations class. This feature is only supported with Linux.
 Here is an example of how you might set this up:
 
 ```python

setup.py

@@ -12,7 +12,6 @@
     "six>=1.9.0",
     "psutil",
     "packaging",
-    "paramiko",
     "fabric",
     "sshtunnel"
 ]
@@ -30,7 +29,7 @@
     readme = f.read()
 
 setup(
-    version='1.9.0',
+    version='1.9.1',
     name='testgres',
     packages=['testgres', 'testgres.operations'],
     description='Testing utility for PostgreSQL and its extensions',

testgres/__init__.py

@@ -46,14 +46,16 @@
     First, \
     Any
 
+from .config import testgres_config
+
 from .operations.os_ops import OsOperations, ConnectionParams
 from .operations.local_ops import LocalOperations
 from .operations.remote_ops import RemoteOperations
 
 __all__ = [
     "get_new_node",
     "get_remote_node",
-    "NodeBackup",
+    "NodeBackup", "testgres_config",
     "TestgresConfig", "configure_testgres", "scoped_config", "push_config", "pop_config",
     "NodeConnection", "DatabaseError", "InternalError", "ProgrammingError", "OperationalError",
     "TestgresException", "ExecUtilException", "QueryException", "TimeoutException", "CatchUpException", "StartNodeException", "InitNodeException", "BackupException",

testgres/cache.py

@@ -57,7 +57,9 @@ def call_initdb(initdb_dir, log=logfile):
                 # our initdb caching mechanism breaks this contract.
                 pg_control = os.path.join(data_dir, XLOG_CONTROL_FILE)
                 system_id = generate_system_id()
-                os_ops.write(pg_control, system_id, truncate=True, binary=True, read_and_write=True)
+                cur_pg_control = os_ops.read(pg_control, binary=True)
+                new_pg_control = system_id + cur_pg_control[len(system_id):]
+                os_ops.write(pg_control, new_pg_control, truncate=True, binary=True, read_and_write=True)
 
                 # XXX: build new WAL segment with our system id
                 _params = [get_bin_path("pg_resetwal"), "-D", data_dir, "-f"]

testgres/operations/local_ops.py

@@ -198,9 +198,15 @@ def touch(self, filename):
         with open(filename, "a"):
             os.utime(filename, None)
 
-    def read(self, filename, encoding=None):
-        with open(filename, "r", encoding=encoding) as file:
-            return file.read()
+    def read(self, filename, encoding=None, binary=False):
+        mode = "rb" if binary else "r"
+        with open(filename, mode) as file:
+            content = file.read()
+            if binary:
+                return content
+            if isinstance(content, bytes):
+                return content.decode(encoding or 'utf-8')
+            return content
 
     def readlines(self, filename, num_lines=0, binary=False, encoding=None):
         """

testgres/operations/remote_ops.py

@@ -118,11 +118,13 @@ def get_bin_path(filename):
     return filename
 
 
-def get_pg_config(pg_config_path=None):
+def get_pg_config(pg_config_path=None, os_ops=None):
     """
     Return output of pg_config (provided that it is installed).
     NOTE: this function caches the result by default (see GlobalConfig).
     """
+    if os_ops:
+        tconf.os_ops = os_ops
 
     def cache_pg_config_data(cmd):
         # execute pg_config and get the output
@@ -146,7 +148,7 @@ def cache_pg_config_data(cmd):
         _pg_config_data = {}
 
     # return cached data
-    if _pg_config_data:
+    if not pg_config_path and _pg_config_data:
         return _pg_config_data
 
     # try specified pg_config path or PG_CONFIG

testgres/utils.py

@@ -17,9 +17,6 @@ def setup(self):
                                            'RDBMS_TESTPOOL_SSHKEY') or '../../container_files/postgres/ssh/id_ed25519')
         self.operations = RemoteOperations(conn_params)
 
-        yield
-        self.operations.__del__()
-
     def test_exec_command_success(self):
         """
         Test exec_command for successful command execution.

tests/test_remote.py

@@ -135,7 +135,6 @@ def test_init_after_cleanup(self):
     @unittest.skipUnless(util_exists('pg_resetwal'), 'might be missing')
     @unittest.skipUnless(pg_version_ge('9.6'), 'requires 9.6+')
     def test_init_unique_system_id(self):
-        # FAIL
         # this function exists in PostgreSQL 9.6+
         query = 'select system_identifier from pg_control_system()'