testgres 1.13.1__tar.gz → 1.13.2__tar.gz

{testgres-1.13.1/testgres.egg-info → testgres-1.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testgres
-Version: 1.13.1
+Version: 1.13.2
 Summary: Testing utility for PostgreSQL and its extensions
 Author-email: Postgres Professional <testgres@postgrespro.ru>
 License: PostgreSQL
@@ -27,10 +27,10 @@ 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.0.0
+Requires-Dist: testgres.os_ops<3.0.0,>=2.0.1
 Dynamic: license-file
 
-[![Build Status](https://api.travis-ci.com/postgrespro/testgres.svg?branch=master)](https://travis-ci.com/github/postgrespro/testgres)
+[![CI Status](https://img.shields.io/github/actions/workflow/status/postgrespro/testgres/.github/workflows/package-verification.yml?label=CI)](https://github.com/postgrespro/testgres/actions/workflows/package-verification.yml)
 [![codecov](https://codecov.io/gh/postgrespro/testgres/branch/master/graph/badge.svg)](https://codecov.io/gh/postgrespro/testgres)
 [![PyPI package version](https://badge.fury.io/py/testgres.svg)](https://badge.fury.io/py/testgres)
 [![PyPI python versions](https://img.shields.io/pypi/pyversions/testgres)](https://pypi.org/project/testgres)

{testgres-1.13.1 → testgres-1.13.2}/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://api.travis-ci.com/postgrespro/testgres.svg?branch=master)](https://travis-ci.com/github/postgrespro/testgres)
+[![CI Status](https://img.shields.io/github/actions/workflow/status/postgrespro/testgres/.github/workflows/package-verification.yml?label=CI)](https://github.com/postgrespro/testgres/actions/workflows/package-verification.yml)
 [![codecov](https://codecov.io/gh/postgrespro/testgres/branch/master/graph/badge.svg)](https://codecov.io/gh/postgrespro/testgres)
 [![PyPI package version](https://badge.fury.io/py/testgres.svg)](https://badge.fury.io/py/testgres)
 [![PyPI python versions](https://img.shields.io/pypi/pyversions/testgres)](https://pypi.org/project/testgres)

{testgres-1.13.1 → testgres-1.13.2}/pyproject.toml

@@ -11,7 +11,7 @@ exclude = [".git", "__pycache__", "env", "venv"]
 
 [project]
 name = "testgres"
-version = "1.13.1"
+version = "1.13.2"
 
 description = "Testing utility for PostgreSQL and its extensions"
 readme = "README.md"
@@ -54,7 +54,7 @@ dependencies = [
     "six>=1.9.0",
     "psutil",
     "packaging",
-    "testgres.os_ops>=2.0.0,<3.0.0",
+    "testgres.os_ops>=2.0.1,<3.0.0",
 ]
 
 [project.urls]

{testgres-1.13.1 → testgres-1.13.2}/src/node.py

@@ -1002,7 +1002,12 @@ class PostgresNode(object):
             raise
         return
 
-    def start(self, params=[], wait=True, exec_env=None) -> PostgresNode:
+    def start(
+        self,
+        params: typing.Optional[typing.List[str]] = None,
+        wait: bool = True,
+        exec_env: typing.Optional[typing.Dict] = None,
+    ) -> PostgresNode:
         """
         Starts the PostgreSQL node using pg_ctl and set flag 'is_started'.
         By default, it waits for the operation to complete before returning.
@@ -1016,7 +1021,11 @@ class PostgresNode(object):
         Returns:
             This instance of :class:`.PostgresNode`.
         """
-        self.start2(params, wait, exec_env)
+        assert params is None or type(params) == list  # noqa: E721
+        assert type(wait) == bool  # noqa: E721
+        assert exec_env is None or type(exec_env) == dict  # noqa: E721
+
+        self._start(params, wait, exec_env)
 
         if not wait:
             # Postmaster process is starting in background
@@ -1029,7 +1038,12 @@ class PostgresNode(object):
         assert type(self._manually_started_pm_pid) == int  # noqa: E721
         return self
 
-    def start2(self, params=[], wait=True, exec_env=None) -> None:
+    def start2(
+        self,
+        params: typing.Optional[typing.List[str]] = None,
+        wait: bool = True,
+        exec_env: typing.Optional[typing.Dict] = None,
+    ) -> None:
         """
         Starts the PostgreSQL node using pg_ctl.
         By default, it waits for the operation to complete before returning.
@@ -1041,9 +1055,25 @@ class PostgresNode(object):
             wait: wait until operation completes.
 
         Returns:
-            This instance of :class:`.PostgresNode`.
+            None.
         """
+        assert params is None or type(params) == list  # noqa: E721
+        assert type(wait) == bool  # noqa: E721
+        assert exec_env is None or type(exec_env) == dict  # noqa: E721
+
+        self._start(params, wait, exec_env)
+        return
+
+    def _start(
+        self,
+        params: typing.Optional[typing.List[str]] = None,
+        wait: bool = True,
+        exec_env: typing.Optional[typing.Dict] = None,
+    ) -> None:
+        assert params is None or type(params) == list  # noqa: E721
+        assert type(wait) == bool  # noqa: E721
         assert exec_env is None or type(exec_env) == dict  # noqa: E721
+
         assert __class__._C_MAX_START_ATEMPTS > 1
 
         if self._port is None:
@@ -1051,11 +1081,17 @@ class PostgresNode(object):
 
         assert type(self._port) == int  # noqa: E721
 
-        _params = [self._get_bin_path("pg_ctl"),
-                   "-D", self.data_dir,
-                   "-l", self.pg_log_file,
-                   "-w" if wait else '-W',  # --wait or --no-wait
-                   "start"] + params  # yapf: disable
+        _params = [
+            self._get_bin_path("pg_ctl"),
+            "start",
+            "-D", self.data_dir,
+            "-l", self.pg_log_file,
+            "-w" if wait else '-W',  # --wait or --no-wait
+        ]
+
+        if params is not None:
+            assert type(params) == list  # noqa: E721
+            _params += params
 
         def LOCAL__start_node():
             # 'error' will be None on Windows
@@ -2304,7 +2340,7 @@ class PostgresNodeLogReader:
         assert self._node is not None
         assert isinstance(self._node, PostgresNode)
 
-        cur_logs: typing.Dict[__class__.LogInfo] = self._collect_logs()
+        cur_logs: typing.Dict[str, __class__.LogInfo] = self._collect_logs()
         assert cur_logs is not None
         assert type(cur_logs) == dict  # noqa: E721
 
@@ -2353,7 +2389,7 @@ class PostgresNodeLogReader:
 
         return result
 
-    def _collect_logs(self) -> typing.Dict[LogInfo]:
+    def _collect_logs(self) -> typing.Dict[str, LogInfo]:
         assert self._node is not None
         assert isinstance(self._node, PostgresNode)
 

{testgres-1.13.1 → testgres-1.13.2/testgres.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testgres
-Version: 1.13.1
+Version: 1.13.2
 Summary: Testing utility for PostgreSQL and its extensions
 Author-email: Postgres Professional <testgres@postgrespro.ru>
 License: PostgreSQL
@@ -27,10 +27,10 @@ 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.0.0
+Requires-Dist: testgres.os_ops<3.0.0,>=2.0.1
 Dynamic: license-file
 
-[![Build Status](https://api.travis-ci.com/postgrespro/testgres.svg?branch=master)](https://travis-ci.com/github/postgrespro/testgres)
+[![CI Status](https://img.shields.io/github/actions/workflow/status/postgrespro/testgres/.github/workflows/package-verification.yml?label=CI)](https://github.com/postgrespro/testgres/actions/workflows/package-verification.yml)
 [![codecov](https://codecov.io/gh/postgrespro/testgres/branch/master/graph/badge.svg)](https://codecov.io/gh/postgrespro/testgres)
 [![PyPI package version](https://badge.fury.io/py/testgres.svg)](https://badge.fury.io/py/testgres)
 [![PyPI python versions](https://img.shields.io/pypi/pyversions/testgres)](https://pypi.org/project/testgres)

{testgres-1.13.1 → testgres-1.13.2}/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.0.0
+testgres.os_ops<3.0.0,>=2.0.1

{testgres-1.13.1 → testgres-1.13.2}/tests/test_os_ops_common.py

@@ -130,6 +130,44 @@ class TestOsOpsCommon:
         assert type(response) == bytes  # noqa: E721
         assert response == b'\n'
 
+    def test_exec_command_with_exec_env__2(self, os_ops: OsOperations):
+        assert isinstance(os_ops, OsOperations)
+
+        RunConditions.skip_if_windows()
+
+        C_ENV_NAME = "TESTGRES_TEST__EXEC_ENV_20250414"
+
+        tmp_file_content = "echo ${{{}}}".format(C_ENV_NAME)
+
+        logging.info("content is [{}]".format(tmp_file_content))
+
+        tmp_file = os_ops.mkstemp()
+        assert type(tmp_file) == str  # noqa: E721
+        assert tmp_file != ""
+
+        logging.info("file is [{}]".format(tmp_file))
+        assert os_ops.path_exists(tmp_file)
+
+        os_ops.write(tmp_file, tmp_file_content)
+
+        cmd = ["sh", tmp_file]
+
+        exec_env = {C_ENV_NAME: "Hello!"}
+
+        response = os_ops.exec_command(cmd, exec_env=exec_env)
+        assert response is not None
+        assert type(response) == bytes  # noqa: E721
+        assert response == b'Hello!\n'
+
+        response = os_ops.exec_command(cmd)
+        assert response is not None
+        assert type(response) == bytes  # noqa: E721
+        assert response == b'\n'
+
+        os_ops.remove_file(tmp_file)
+        assert not os_ops.path_exists(tmp_file)
+        return
+
     def test_exec_command_with_cwd(self, os_ops: OsOperations):
         assert isinstance(os_ops, OsOperations)
 
@@ -876,8 +914,16 @@ class TestOsOpsCommon:
         actual_dir = os_ops.get_tempdir()
         assert actual_dir is not None
         assert type(actual_dir) == str  # noqa: E721
-        expected_dir = str(tempfile.tempdir)
-        assert actual_dir == expected_dir
+
+        # --------
+        cmd = [sys.executable, "-c", "import tempfile;print(tempfile.gettempdir());"]
+
+        expected_dir_b = os_ops.exec_command(cmd)
+        assert type(expected_dir_b) == bytes  # noqa: E721
+        expected_dir = expected_dir_b.decode()
+        assert type(expected_dir) == str  # noqa: E721
+        assert actual_dir + "\n" == expected_dir
+        return
 
     class tagData_OS_OPS__NUMS:
         os_ops_descr: OsOpsDescr