[#265] NodeApp.make_simple links a new node with own os_ops and port_…

…manager objects
postgrespro · dmitry-lipetsk · Jun 30, 2025 · Jun 26, 2025 · Jun 26, 2025 · Jun 26, 2025
commit 488d5566f80ff053f8f3275b4ef894498707e956
diff --git a/testgres/node_app.py b/testgres/node_app.py
@@ -1,6 +1,7 @@
 from .node import OsOperations
 from .node import LocalOperations
 from .node import PostgresNode
+from .node import PortManager
 
 import os
 import platform
@@ -13,23 +14,27 @@
 
 
 class NodeApp:
-    _os_ops: OsOperations
     _test_path: str
+    _os_ops: OsOperations
+    _port_manager: PortManager
 
     def __init__(
         self,
         test_path: typing.Optional[str] = None,
         nodes_to_cleanup: typing.Optional[list] = None,
-        os_ops: typing.Optional[OsOperations] = None
+        os_ops: typing.Optional[OsOperations] = None,
+        port_manager: typing.Optional[PortManager] = None,
     ):
         assert test_path is None or type(test_path) == str  # noqa: E721
         assert os_ops is None or isinstance(os_ops, OsOperations)
+        assert port_manager is None or isinstance(port_manager, PortManager)
 
         if os_ops is None:
             os_ops = LocalOperations.get_single_instance()
 
         assert isinstance(os_ops, OsOperations)
         self._os_ops = os_ops
+        self._port_manager = port_manager
 
         if test_path is None:
             self._test_path = os_ops.cwd()
@@ -45,6 +50,11 @@ def os_ops(self) -> OsOperations:
         assert isinstance(self._os_ops, OsOperations)
         return self._os_ops
 
+    @property
+    def port_manager(self) -> PortManager:
+        assert self._port_manager is None or isinstance(self._port_manager, PortManager)
+        return self._port_manager
+
     @property
     def test_path(self) -> str:
         assert type(self._test_path) == str  # noqa: E721
@@ -73,7 +83,19 @@ def make_empty(
         self._os_ops.rmdirs(real_base_dir, ignore_errors=True)
         self._os_ops.makedirs(real_base_dir)
 
-        node = PostgresNode(base_dir=real_base_dir, port=port, bin_dir=bin_dir)
+        port_manager: PortManager = None
+
+        if port is None:
+            port_manager = self._port_manager
+
+        node = PostgresNode(
+            base_dir=real_base_dir,
+            port=port,
+            bin_dir=bin_dir,
+            os_ops=self._os_ops,
+            port_manager=port_manager
+        )
+
         self.nodes_to_cleanup.append(node)
 
         return node

diff --git a/tests/test_testgres_common.py b/tests/test_testgres_common.py
@@ -1675,6 +1675,44 @@ def test_node_app__make_empty__base_dir_is_Empty(self, node_svc: PostgresNodeSer
         logging.info("temp directory [{}] is deleting".format(tmp_dir))
         node_svc.os_ops.rmdir(tmp_dir)
 
+    def test_node_app__make_empty(self, node_svc: PostgresNodeService):
+        assert type(node_svc) == PostgresNodeService  # noqa: E721
+
+        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) == str  # noqa: E721
+        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
+        )
+
+        assert node_app.os_ops is node_svc.os_ops
+        assert node_app.port_manager is node_svc.port_manager
+
+        try:
+            node = node_app.make_simple("node")
+            assert node.os_ops is node_svc.os_ops
+            assert node.port_manager is node_svc.port_manager
+
+            node.slow_start()
+        except:  # noqa: E722
+            node.stop()
+            raise
+
+        node.cleanup(release_resources=True)
+
+        # -----------
+        logging.info("temp directory [{}] is deleting".format(tmp_dir))
+        node_svc.os_ops.rmdir(tmp_dir)
+
     def test_node_app__make_simple__checksum(self, node_svc: PostgresNodeService):
         assert type(node_svc) == PostgresNodeService  # noqa: E721