testgres 1.15.2__tar.gz → 1.16.1__tar.gz

{testgres-1.15.2/testgres.egg-info → testgres-1.16.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testgres
-Version: 1.15.2
+Version: 1.16.1
 Summary: Testing utility for PostgreSQL and its extensions
 Author-email: Postgres Professional <testgres@postgrespro.ru>
 License: PostgreSQL
@@ -27,7 +27,7 @@ Requires-Dist: port-for>=0.4
 Requires-Dist: six>=1.9.0
 Requires-Dist: psutil
 Requires-Dist: packaging
-Requires-Dist: testgres.os_ops<4.0.0,>=3.2.0
+Requires-Dist: testgres.os_ops<4.0.0,>=3.3.0
 Dynamic: license-file
 
 [![CI Status](https://img.shields.io/github/actions/workflow/status/postgrespro/testgres/.github/workflows/ci.yml?label=CI)](https://github.com/postgrespro/testgres/actions/workflows/ci.yml)

{testgres-1.15.2 → testgres-1.16.1}/pyproject.toml

@@ -65,7 +65,7 @@ dependencies = [
     "six>=1.9.0",
     "psutil",
     "packaging",
-    "testgres.os_ops>=3.2.0,<4.0.0",
+    "testgres.os_ops>=3.3.0,<4.0.0",
 ]
 
 [project.urls]

{testgres-1.15.2 → testgres-1.16.1}/src/__init__.py

@@ -18,6 +18,7 @@ from .connection import \
 from .exceptions import \
     TestgresException, \
     ExecUtilException, \
+    ExecTimeoutException, \
     QueryException, \
     QueryTimeoutException, \
     TimeoutException, \
@@ -53,11 +54,13 @@ from .standby import \
 
 from .config import testgres_config
 
-from testgres.operations.os_ops import OsOperations, ConnectionParams
+from testgres.operations.os_ops import OsOperations
+from testgres.operations.os_ops import ConnectionParams
+from testgres.operations.os_ops import OsProcessController
 from testgres.operations.local_ops import LocalOperations
 from testgres.operations.remote_ops import RemoteOperations
 
-__version__ = "1.15.2"
+__version__ = "1.16.1"
 
 __all__ = [
     "get_new_node",
@@ -66,6 +69,7 @@ __all__ = [
     "TestgresConfig", "configure_testgres", "scoped_config", "push_config", "pop_config",
     "NodeConnection", "DatabaseError", "InternalError", "ProgrammingError", "OperationalError",
     "TestgresException", "ExecUtilException", "QueryException",
+    "ExecTimeoutException",
     "QueryTimeoutException",
     "TimeoutException", "CatchUpException", "StartNodeException", "InitNodeException", "BackupException", "InvalidOperationException",
     "XLogMethod", "IsolationLevel", "NodeStatus", "ProcessType", "DumpFormat",
@@ -74,5 +78,6 @@ __all__ = [
     "PortManager",
     "reserve_port", "release_port", "get_bin_path", "get_bin_dir", "get_pg_config", "get_pg_version", "parse_pg_version",
     "First", "Any",
-    "OsOperations", "LocalOperations", "RemoteOperations", "ConnectionParams"
+    "OsOperations", "LocalOperations", "RemoteOperations", "ConnectionParams",
+    "OsProcessController",
 ]

{testgres-1.15.2 → testgres-1.16.1}/src/backup.py

@@ -15,9 +15,10 @@ from .exceptions import BackupException
 
 from testgres.operations.os_ops import OsOperations
 
+from . import utils
+
 from .utils import \
     get_bin_path2, \
-    execute_utility2, \
     clean_on_error
 
 
@@ -86,7 +87,13 @@ class NodeBackup(object):
             "-X", xlog_method.value
         ]  # yapf: disable
         _params += options
-        execute_utility2(self.os_ops, _params, self.log_file)
+
+        utils.execute_utility3(
+            self.os_ops,
+            _params,
+            self.log_file,
+        )
+        return
 
     def __enter__(self):
         return self

{testgres-1.15.2 → testgres-1.16.1}/src/cache.py

@@ -8,14 +8,12 @@ from .consts import XLOG_CONTROL_FILE
 
 from .defaults import generate_system_id
 
+from . import utils
+
 from .exceptions import \
     InitNodeException, \
     ExecUtilException
 
-from .utils import \
-    get_bin_path2, \
-    execute_utility2
-
 from testgres.operations.local_ops import LocalOperations
 from testgres.operations.os_ops import OsOperations
 
@@ -39,13 +37,17 @@ def cached_initdb(data_dir, logfile=None, params=None, os_ops: OsOperations = No
         if bin_path:
             return os_ops.build_path(bin_path, name)
 
-        return get_bin_path2(os_ops, name)
+        return utils.get_bin_path2(os_ops, name)
 
     def call_initdb(initdb_dir, log=logfile):
         try:
             initdb_path = make_utility_path("initdb")
             _params = [initdb_path, "-D", initdb_dir, "-N"]
-            execute_utility2(os_ops, _params + (params or []), log)
+            utils.execute_utility3(
+                os_ops,
+                _params + (params or []),
+                log,
+            )
         except ExecUtilException as e:
             raise_from(InitNodeException("Failed to run initdb"), e)
 
@@ -78,7 +80,12 @@ def cached_initdb(data_dir, logfile=None, params=None, os_ops: OsOperations = No
 
                 # XXX: build new WAL segment with our system id
                 _params = [make_utility_path("pg_resetwal"), "-D", data_dir, "-f"]
-                execute_utility2(os_ops, _params, logfile)
+
+                utils.execute_utility3(
+                    os_ops,
+                    _params,
+                    logfile,
+                )
 
         except ExecUtilException as e:
             msg = "Failed to reset WAL for system id"

{testgres-1.15.2 → testgres-1.16.1}/src/consts.py

@@ -1,5 +1,8 @@
 # coding: utf-8
 
+# binary names
+BINARY_NAME__POSTGRES = "postgres"
+
 # names for dirs in base_dir
 DATA_DIR = "data"
 LOGS_DIR = "logs"

{testgres-1.15.2 → testgres-1.16.1}/src/exceptions.py

@@ -6,6 +6,7 @@ import typing
 from testgres.operations.exceptions import TestgresException
 from testgres.operations.exceptions import ExecUtilException
 from testgres.operations.exceptions import InvalidOperationException
+from testgres.operations.exceptions import ExecTimeoutException
 
 
 class PortForException(TestgresException):
@@ -112,7 +113,7 @@ class QueryTimeoutException(QueryException):
     def __init__(
         self,
         message: typing.Optional[str] = None,
-        query: typing.Optional[str] = None
+        query: typing.Optional[str] = None,
     ):
         assert message is None or type(message) is str
         assert query is None or type(query) is str
@@ -169,7 +170,7 @@ class StartNodeException(TestgresException):
     def __init__(
         self,
         message: typing.Optional[str] = None,
-        files: typing.Optional[typing.Iterable] = None
+        files: typing.Optional[typing.Iterable] = None,
     ):
         assert message is None or type(message) is str
         assert files is None or isinstance(files, typing.Iterable)
@@ -298,3 +299,4 @@ class BackupException(TestgresException):
 
 assert ExecUtilException.__name__ == "ExecUtilException"
 assert InvalidOperationException.__name__ == "InvalidOperationException"
+assert ExecTimeoutException.__name__ == "ExecTimeoutException"

{testgres-1.15.2 → testgres-1.16.1}/src/impl/platforms/linux/internal_platform_utils.py

@@ -5,7 +5,9 @@ from ... import internal_utils
 from ....raise_error import RaiseError
 
 from testgres.operations.os_ops import OsOperations
+from testgres.operations.os_ops import OsCommandResult
 from testgres.operations.exceptions import ExecUtilException
+from testgres.operations.types import T_OS_EXEC_ENV
 
 import re
 import shlex
@@ -17,7 +19,7 @@ class InternalPlatformUtils(base.InternalPlatformUtils):
     C_MAX_FIND_POSTMASTER_ATTEMPTS = 5
     C_BASH_EXE = "/bin/bash"
 
-    sm_exec_env = {
+    sm_exec_env: T_OS_EXEC_ENV = {
         "LANG": "en_US.UTF-8",
         "LC_ALL": "en_US.UTF-8",
     }
@@ -113,37 +115,32 @@ class InternalPlatformUtils(base.InternalPlatformUtils):
             "ps -ewwo \"pid=,ppid=,args=\" | grep -E " + shlex.quote(regexp),
            ]
 
-        exec_r = os_ops.exec_command(
+        exec_r = os_ops.run(
             cmd=cmd,
-            ignore_errors=True,
-            verbose=True,
+            check=False,
             exec_env=__class__.sm_exec_env,
         )
 
-        assert type(exec_r) is tuple
-        assert len(exec_r) == 3
+        assert type(exec_r) is OsCommandResult
+        assert type(exec_r.returncode) is int
+        assert type(exec_r.stdout) is bytes
+        assert type(exec_r.stderr) is bytes
 
-        exit_status, output_b, error_b = exec_r
-
-        assert type(exit_status) is int
-        assert type(output_b) is bytes
-        assert type(error_b) is bytes
-
-        if exit_status == 1:
+        if exec_r.returncode == 1:
             return None
 
-        output = output_b.decode("utf-8")
-        error = error_b.decode("utf-8")
+        output = exec_r.stdout.decode("utf-8")
+        error = exec_r.stderr.decode("utf-8")
 
         assert type(output) is str
         assert type(error) is str
 
-        if exit_status != 0:
-            errMsg = f"test command returned an unexpected exit code: {exit_status}"
+        if exec_r.returncode != 0:
+            errMsg = f"test command returned an unexpected exit code: {exec_r.returncode}"
             raise ExecUtilException(
                 message=errMsg,
                 command=cmd,
-                exit_code=exit_status,
+                exit_code=exec_r.returncode,
                 out=output,
                 error=error,
             )