testgres 1.10.5__tar.gz → 1.11.0__tar.gz

{testgres-1.10.5/testgres.egg-info → testgres-1.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: testgres
-Version: 1.10.5
+Version: 1.11.0
 Summary: Testing utility for PostgreSQL and its extensions
 Home-page: https://github.com/postgrespro/testgres
 Author: Postgres Professional
@@ -21,10 +21,11 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 
-[![Build Status](https://travis-ci.com/postgrespro/testgres.svg?branch=master)](https://app.travis-ci.com/github/postgrespro/testgres/branches)
+[![Build Status](https://api.travis-ci.com/postgrespro/testgres.svg?branch=master)](https://travis-ci.com/github/postgrespro/testgres)
 [![codecov](https://codecov.io/gh/postgrespro/testgres/branch/master/graph/badge.svg)](https://codecov.io/gh/postgrespro/testgres)
 [![PyPI version](https://badge.fury.io/py/testgres.svg)](https://badge.fury.io/py/testgres)
 

{testgres-1.10.5 → testgres-1.11.0}/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.com/postgrespro/testgres.svg?branch=master)](https://app.travis-ci.com/github/postgrespro/testgres/branches)
+[![Build Status](https://api.travis-ci.com/postgrespro/testgres.svg?branch=master)](https://travis-ci.com/github/postgrespro/testgres)
 [![codecov](https://codecov.io/gh/postgrespro/testgres/branch/master/graph/badge.svg)](https://codecov.io/gh/postgrespro/testgres)
 [![PyPI version](https://badge.fury.io/py/testgres.svg)](https://badge.fury.io/py/testgres)
 

{testgres-1.10.5 → testgres-1.11.0}/setup.py

@@ -27,9 +27,9 @@ with open('README.md', 'r') as f:
     readme = f.read()
 
 setup(
-    version='1.10.5',
+    version='1.11.0',
     name='testgres',
-    packages=['testgres', 'testgres.operations', 'testgres.helpers'],
+    packages=['testgres', 'testgres.operations'],
     description='Testing utility for PostgreSQL and its extensions',
     url='https://github.com/postgrespro/testgres',
     long_description=readme,

{testgres-1.10.5 → testgres-1.11.0}/testgres/__init__.py

@@ -34,6 +34,7 @@ from .enums import \
     DumpFormat
 
 from .node import PostgresNode, NodeApp
+from .node import PortManager
 
 from .utils import \
     reserve_port, \
@@ -53,8 +54,6 @@ from .operations.os_ops import OsOperations, ConnectionParams
 from .operations.local_ops import LocalOperations
 from .operations.remote_ops import RemoteOperations
 
-from .helpers.port_manager import PortManager
-
 __all__ = [
     "get_new_node",
     "get_remote_node",
@@ -64,7 +63,8 @@ __all__ = [
     "TestgresException", "ExecUtilException", "QueryException", "TimeoutException", "CatchUpException", "StartNodeException", "InitNodeException", "BackupException", "InvalidOperationException",
     "XLogMethod", "IsolationLevel", "NodeStatus", "ProcessType", "DumpFormat",
     "PostgresNode", "NodeApp",
+    "PortManager",
     "reserve_port", "release_port", "bound_ports", "get_bin_path", "get_pg_config", "get_pg_version",
-    "First", "Any", "PortManager",
+    "First", "Any",
     "OsOperations", "LocalOperations", "RemoteOperations", "ConnectionParams"
 ]

{testgres-1.10.5 → testgres-1.11.0}/testgres/api.py

@@ -47,8 +47,6 @@ def get_remote_node(name=None, conn_params=None):
     Simply a wrapper around :class:`.PostgresNode` constructor for remote node.
     See :meth:`.PostgresNode.__init__` for details.
     For remote connection you can add the next parameter:
-    conn_params = ConnectionParams(host='127.0.0.1',
-                                   ssh_key=None,
-                                   username=default_username())
+    conn_params = ConnectionParams(host='127.0.0.1', ssh_key=None, username=default_username())
     """
     return get_new_node(name=name, conn_params=conn_params)

{testgres-1.10.5 → testgres-1.11.0}/testgres/backup.py

@@ -15,9 +15,11 @@ from .consts import \
 
 from .exceptions import BackupException
 
+from .operations.os_ops import OsOperations
+
 from .utils import \
-    get_bin_path, \
-    execute_utility, \
+    get_bin_path2, \
+    execute_utility2, \
     clean_on_error
 
 
@@ -44,6 +46,9 @@ class NodeBackup(object):
             username: database user name.
             xlog_method: none | fetch | stream (see docs)
         """
+        assert node.os_ops is not None
+        assert isinstance(node.os_ops, OsOperations)
+
         if not options:
             options = []
         self.os_ops = node.os_ops
@@ -73,7 +78,7 @@ class NodeBackup(object):
         data_dir = os.path.join(self.base_dir, DATA_DIR)
 
         _params = [
-            get_bin_path("pg_basebackup"),
+            get_bin_path2(self.os_ops, "pg_basebackup"),
             "-p", str(node.port),
             "-h", node.host,
             "-U", username,
@@ -81,7 +86,7 @@ class NodeBackup(object):
             "-X", xlog_method.value
         ]  # yapf: disable
         _params += options
-        execute_utility(_params, self.log_file)
+        execute_utility2(self.os_ops, _params, self.log_file)
 
     def __enter__(self):
         return self
@@ -142,8 +147,19 @@ class NodeBackup(object):
         base_dir = self._prepare_dir(destroy)
 
         # Build a new PostgresNode
-        NodeClass = self.original_node.__class__
-        with clean_on_error(NodeClass(name=name, base_dir=base_dir, conn_params=self.original_node.os_ops.conn_params)) as node:
+        assert self.original_node is not None
+
+        if (hasattr(self.original_node, "clone_with_new_name_and_base_dir")):
+            node = self.original_node.clone_with_new_name_and_base_dir(name=name, base_dir=base_dir)
+        else:
+            # For backward compatibility
+            NodeClass = self.original_node.__class__
+            node = NodeClass(name=name, base_dir=base_dir, conn_params=self.original_node.os_ops.conn_params)
+
+        assert node is not None
+        assert type(node) == self.original_node.__class__  # noqa: E721
+
+        with clean_on_error(node) as node:
 
             # New nodes should always remove dir tree
             node._should_rm_dirs = True

{testgres-1.10.5 → testgres-1.11.0}/testgres/cache.py

@@ -15,8 +15,8 @@ from .exceptions import \
     ExecUtilException
 
 from .utils import \
-    get_bin_path, \
-    execute_utility
+    get_bin_path2, \
+    execute_utility2
 
 from .operations.local_ops import LocalOperations
 from .operations.os_ops import OsOperations
@@ -27,11 +27,23 @@ def cached_initdb(data_dir, logfile=None, params=None, os_ops: OsOperations = Lo
     Perform initdb or use cached node files.
     """
 
+    assert os_ops is not None
+    assert isinstance(os_ops, OsOperations)
+
+    def make_utility_path(name):
+        assert name is not None
+        assert type(name) == str  # noqa: E721
+
+        if bin_path:
+            return os.path.join(bin_path, name)
+
+        return get_bin_path2(os_ops, name)
+
     def call_initdb(initdb_dir, log=logfile):
         try:
-            initdb_path = os.path.join(bin_path, 'initdb') if bin_path else get_bin_path("initdb")
+            initdb_path = make_utility_path("initdb")
             _params = [initdb_path, "-D", initdb_dir, "-N"]
-            execute_utility(_params + (params or []), log)
+            execute_utility2(os_ops, _params + (params or []), log)
         except ExecUtilException as e:
             raise_from(InitNodeException("Failed to run initdb"), e)
 
@@ -63,8 +75,8 @@ def cached_initdb(data_dir, logfile=None, params=None, os_ops: OsOperations = Lo
                 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"]
-                execute_utility(_params, logfile)
+                _params = [make_utility_path("pg_resetwal"), "-D", data_dir, "-f"]
+                execute_utility2(os_ops, _params, logfile)
 
         except ExecUtilException as e:
             msg = "Failed to reset WAL for system id"

{testgres-1.10.5 → testgres-1.11.0}/testgres/connection.py

@@ -42,11 +42,13 @@ class NodeConnection(object):
 
         self._node = node
 
-        self._connection = node.os_ops.db_connect(dbname=dbname,
-                                                  user=username,
-                                                  password=password,
-                                                  host=node.host,
-                                                  port=node.port)
+        self._connection = pglib.connect(
+            database=dbname,
+            user=username,
+            password=password,
+            host=node.host,
+            port=node.port
+        )
 
         self._connection.autocommit = autocommit
         self._cursor = self.connection.cursor()

{testgres-1.10.5 → testgres-1.11.0}/testgres/consts.py

@@ -35,3 +35,7 @@ MAX_WAL_SENDERS = 10
 
 # logical replication settings
 LOGICAL_REPL_MAX_CATCHUP_ATTEMPTS = 60
+
+PG_CTL__STATUS__OK = 0
+PG_CTL__STATUS__NODE_IS_STOPPED = 3
+PG_CTL__STATUS__BAD_DATADIR = 4

{testgres-1.10.5 → testgres-1.11.0}/testgres/exceptions.py

@@ -7,6 +7,10 @@ class TestgresException(Exception):
     pass
 
 
+class PortForException(TestgresException):
+    pass
+
+
 @six.python_2_unicode_compatible
 class ExecUtilException(TestgresException):
     def __init__(self, message=None, command=None, exit_code=0, out=None, error=None):