testgres 1.14.1__tar.gz → 1.14.3__tar.gz

{testgres-1.14.1/testgres.egg-info → testgres-1.14.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testgres
-Version: 1.14.1
+Version: 1.14.3
 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<3.0.0,>=2.3.0
+Requires-Dist: testgres.os_ops<3.0.0,>=2.4.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.14.1 → testgres-1.14.3}/pyproject.toml

@@ -65,7 +65,7 @@ dependencies = [
     "six>=1.9.0",
     "psutil",
     "packaging",
-    "testgres.os_ops>=2.3.0,<3.0.0",
+    "testgres.os_ops>=2.4.0,<3.0.0",
 ]
 
 [project.urls]

{testgres-1.14.1 → testgres-1.14.3}/src/__init__.py

@@ -56,7 +56,7 @@ from testgres.operations.os_ops import OsOperations, ConnectionParams
 from testgres.operations.local_ops import LocalOperations
 from testgres.operations.remote_ops import RemoteOperations
 
-__version__ = "1.14.1"
+__version__ = "1.14.3"
 
 __all__ = [
     "get_new_node",

{testgres-1.14.1 → testgres-1.14.3}/src/node.py

@@ -1926,8 +1926,10 @@ class PostgresNode(object):
         # should be the last one
         _params.append(dbname)
 
-        proc = self._os_ops.exec_command(_params, stdout=stdout, stderr=stderr, wait_exit=True, get_process=True)
+        proc = self._os_ops.exec_command(_params, stdout=stdout, stderr=stderr, get_process=True)
 
+        # [2026-06-21] It is so
+        assert isinstance(proc, subprocess.Popen)
         return proc
 
     def pgbench_with_wait(self,

{testgres-1.14.1 → testgres-1.14.3}/src/node_app.py

@@ -99,7 +99,7 @@ class NodeApp:
             port=port,
             bin_dir=bin_dir,
             os_ops=self._os_ops,
-            port_manager=port_manager
+            port_manager=port_manager,
         )
 
         try:
@@ -150,7 +150,10 @@ class NodeApp:
 
         node.init(
             initdb_params=final_initdb_params,
-            allow_streaming=set_replication
+            # params for node.default_conf
+            fsync=False,
+            allow_streaming=set_replication,
+            log_statement="none",
         )
 
         # set major version
@@ -164,11 +167,9 @@ class NodeApp:
         options = {
             'max_connections': 100,
             'shared_buffers': '10MB',
-            'fsync': 'off',
             'wal_level': 'logical',
             'hot_standby': 'off',
             'log_line_prefix': '%t [%p]: [%l-1] ',
-            'log_statement': 'none',
             'log_duration': 'on',
             'log_min_duration_statement': 0,
             'log_connections': 'on',

{testgres-1.14.1 → testgres-1.14.3}/src/utils.py

@@ -101,14 +101,21 @@ def execute_utility2(
     assert type(ignore_errors) is bool
     assert exec_env is None or type(exec_env) is dict
 
-    exit_status, out, error = os_ops.exec_command(
+    exec_r = os_ops.exec_command(
         args,
         verbose=True,
         ignore_errors=ignore_errors,
         encoding=OsHelpers.GetDefaultEncoding(),
-        exec_env=exec_env)
+        exec_env=exec_env,
+    )
 
-    out = '' if not out else out
+    assert type(exec_r) is tuple
+    assert len(exec_r) == 3
+
+    exit_status, out, _ = exec_r
+
+    assert type(exit_status) is int
+    assert type(out) is str
 
     # write new log entry if possible
     if logfile:
@@ -122,9 +129,9 @@ def execute_utility2(
             raise ExecUtilException(
                 "Problem with writing to logfile `{}` during run command `{}`".format(logfile, args))
     if verbose:
-        return exit_status, out, error
-    else:
-        return out
+        return exec_r
+
+    return out
 
 
 def get_bin_path(filename):
@@ -211,6 +218,7 @@ def get_pg_config2(os_ops: OsOperations, pg_config_path):
     def cache_pg_config_data(cmd):
         # execute pg_config and get the output
         out = os_ops.exec_command(cmd, encoding='utf-8')
+        assert type(out) is str
 
         data = {}
         for line in out.splitlines():

{testgres-1.14.1 → testgres-1.14.3/testgres.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testgres
-Version: 1.14.1
+Version: 1.14.3
 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<3.0.0,>=2.3.0
+Requires-Dist: testgres.os_ops<3.0.0,>=2.4.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.14.1 → testgres-1.14.3}/testgres.egg-info/requires.txt

@@ -3,4 +3,4 @@ port-for>=0.4
 six>=1.9.0
 psutil
 packaging
-testgres.os_ops<3.0.0,>=2.3.0
+testgres.os_ops<3.0.0,>=2.4.0

{testgres-1.14.1 → testgres-1.14.3}/tests/test_os_ops_common.py

@@ -74,7 +74,7 @@ class TestOsOpsCommon:
         cmd = ["sh", "-c", "python3 --version"]
 
         response = os_ops.exec_command(cmd)
-
+        assert type(response) is bytes
         assert b'Python 3.' in response
 
     def test_exec_command_failure(self, os_ops: OsOperations):
@@ -273,7 +273,9 @@ class TestOsOpsCommon:
         RunConditions.skip_if_windows()
 
         cmd = "pwd"
-        pwd = os_ops.exec_command(cmd, wait_exit=True, encoding='utf-8').strip()
+        stdout = os_ops.exec_command(cmd, encoding='utf-8')
+        assert type(stdout) is str
+        pwd = stdout.strip()
 
         path = "{}/test_dir".format(pwd)
 
@@ -898,7 +900,7 @@ class TestOsOpsCommon:
         if ok_count == 0:
             raise RuntimeError("No one free port was found.")
 
-    def test_get_tmpdir(self, os_ops: OsOperations):
+    def test_get_tempdir(self, os_ops: OsOperations):
         assert isinstance(os_ops, OsOperations)
 
         dir = os_ops.get_tempdir()
@@ -922,7 +924,7 @@ class TestOsOpsCommon:
         assert not os_ops.path_exists(file_path)
         assert not os.path.exists(file_path)
 
-    def test_get_tmpdir__compare_with_py_info(self, os_ops: OsOperations):
+    def test_get_tempdir__compare_with_py_info(self, os_ops: OsOperations):
         assert isinstance(os_ops, OsOperations)
 
         actual_dir = os_ops.get_tempdir()

{testgres-1.14.1 → testgres-1.14.3}/tests/test_testgres_common.py

@@ -51,6 +51,7 @@ import subprocess
 import typing
 import types
 import psutil
+import testgres.postgres_configuration as testgres_pgconf
 
 from packaging.version import Version
 
@@ -95,7 +96,7 @@ class TestTestgresCommon:
         # Author: Mark G.
         assert v.major == 1
         assert v.minor == 14
-        assert v.micro == 1
+        assert v.micro == 3
 
         assert str(v) == testgres_version
         return
@@ -2760,6 +2761,56 @@ where c.relname=%s;"""
         node_svc.os_ops.rmdirs(tmp_dir)
         return
 
+    def test_node_app__make_empty_and_pgconf(self, node_svc: PostgresNodeService):
+        assert type(node_svc) is PostgresNodeService
+
+        assert type(node_svc) is PostgresNodeService
+
+        assert isinstance(node_svc.os_ops, OsOperations)
+        assert node_svc.port_manager is not None
+        assert isinstance(node_svc.port_manager, PortManager)
+
+        tmp_dir = node_svc.os_ops.mkdtemp()
+        assert tmp_dir is not None
+        assert type(tmp_dir) is str
+        logging.info("temp directory is [{}]".format(tmp_dir))
+
+        # -----------
+        node_app = NodeApp(
+            test_path=tmp_dir,
+            os_ops=node_svc.os_ops,
+            port_manager=node_svc.port_manager
+        )
+
+        # TODO: We have to use node_svc.os_ops here
+
+        with node_app.make_simple("abc") as node:
+            node_conf = testgres_pgconf.PostgresConfiguration(node.data_dir)
+
+            logging.info("Configuration is readed ...")
+            testgres_pgconf.PostgresConfigurationReader.LoadConfiguration(node_conf)
+
+            logging.info("Configuration is checked ...")
+            prop__port = node_conf.GetOptionValue("port")
+            assert type(prop__port) is int
+            assert prop__port == node.port
+            # presets are checked
+            prop__fsync = node_conf.GetOptionValue("fsync")
+            assert prop__fsync == "off" or prop__fsync is False
+            prop__log_statement = node_conf.GetOptionValue("log_statement")
+            assert type(prop__log_statement) is str
+            assert prop__log_statement == "none"
+            prop__wal_level = node_conf.GetOptionValue("wal_level")
+            assert type(prop__wal_level) is str
+            assert prop__wal_level == "logical"
+
+            logging.info("Configuration is written ...")
+            testgres_pgconf.PostgresConfigurationWriter.WriteConfiguration(node_conf)
+
+            logging.info("Node is started ...")
+            node.slow_start()
+        return
+
     @staticmethod
     def helper__get_node(
         node_svc: PostgresNodeService,