Mar 12, 2025 · Mar 12, 2025 · Mar 13, 2025 · Mar 13, 2025 · Mar 13, 2025 · Mar 14, 2025
diff --git a/testgres/backup.py b/testgres/backup.py
        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:
        with clean_on_error(self.original_node.clone_with_new_name_and_base_dir(name=name, base_dir=base_dir)) as node:

            # New nodes should always remove dir tree
            node._should_rm_dirs = True
diff --git a/testgres/node.py b/testgres/node.py

 class PostgresNode(PostgresNode_Base):
    def __init__(self, name=None, base_dir=None, port=None, conn_params: ConnectionParams = ConnectionParams(),
                 bin_dir=None, prefix=None):
                 bin_dir=None, prefix=None, os_ops=None):
        """
        PostgresNode constructor.

            prefix: signature of temporary directory if it is required.
        """

        os_ops = __class__._get_os_ops(conn_params)
        if os_ops is None:
            os_ops = __class__._get_os_ops(conn_params)
        else:
            assert conn_params is None
            pass

        assert os_ops is not None
        assert isinstance(os_ops, OsOperations)

        super().__init__(os_ops, name=name, port=port, bin_dir=bin_dir)

        # it is needed to clone
        self._prefix = prefix

        if base_dir:
            self._base_dir = base_dir
        else:
            self._base_dir = os_ops.mkdtemp(prefix or TMP_NODE)

    @staticmethod
    def _get_os_ops(conn_params: ConnectionParams) -> OsOperations:
        assert type(conn_params) == ConnectionParams  # noqa: E721

        if testgres_config.os_ops:
            return testgres_config.os_ops

        assert type(conn_params) == ConnectionParams  # noqa: E721

        if conn_params.ssh_key:
            return RemoteOperations(conn_params)

        return LocalOperations(conn_params)

    def clone_with_new_name_and_base_dir(self, name: str, base_dir: str):
        assert name is None or type(name) == str  # noqa: E721
        assert base_dir is None or type(base_dir) == str  # noqa: E721

        node = PostgresNode(
            name=name,
            base_dir=base_dir,
            conn_params=None,
            bin_dir=self._bin_dir,
            prefix=self._prefix,
            os_ops=self._os_ops)

        return node

    @property
    def base_dir(self):
        # NOTE: it's safe to create a new dir
diff --git a/testgres/node_base.py b/testgres/node_base.py
        return "{}(name='{}', port={}, base_dir='{}')".format(
            self.__class__.__name__, self.name, self.port, self.base_dir)

    def clone_with_new_name_and_base_dir(self, name: str, base_dir: str):
        raise NotImplementedError("PostgresNode_Base::clone_with_new_name_and_base_dir is not implemented")

    @property
    def pid(self):
        """
Original file line number	Diff line number	Diff line change
Expand Up		@@ -147,8 +147,7 @@ def spawn_primary(self, name=None, destroy=True):
		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:
		with clean_on_error(self.original_node.clone_with_new_name_and_base_dir(name=name, base_dir=base_dir)) as node:

		# New nodes should always remove dir tree
		node._should_rm_dirs = True
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -106,7 +106,7 @@

		class PostgresNode(PostgresNode_Base):
		def __init__(self, name=None, base_dir=None, port=None, conn_params: ConnectionParams = ConnectionParams(),
		bin_dir=None, prefix=None):
		bin_dir=None, prefix=None, os_ops=None):
		"""
		PostgresNode constructor.

Expand All		@@ -119,29 +119,51 @@ def __init__(self, name=None, base_dir=None, port=None, conn_params: ConnectionP
		prefix: signature of temporary directory if it is required.
		"""

		os_ops = __class__._get_os_ops(conn_params)
		if os_ops is None:
		os_ops = __class__._get_os_ops(conn_params)
		else:
		assert conn_params is None
		pass

		assert os_ops is not None
		assert isinstance(os_ops, OsOperations)

		super().__init__(os_ops, name=name, port=port, bin_dir=bin_dir)

		# it is needed to clone
		self._prefix = prefix

		if base_dir:
		self._base_dir = base_dir
		else:
		self._base_dir = os_ops.mkdtemp(prefix or TMP_NODE)

		@staticmethod
		def _get_os_ops(conn_params: ConnectionParams) -> OsOperations:
		assert type(conn_params) == ConnectionParams # noqa: E721

		if testgres_config.os_ops:
		return testgres_config.os_ops

		assert type(conn_params) == ConnectionParams # noqa: E721

		if conn_params.ssh_key:
		return RemoteOperations(conn_params)

		return LocalOperations(conn_params)

		def clone_with_new_name_and_base_dir(self, name: str, base_dir: str):
		assert name is None or type(name) == str # noqa: E721
		assert base_dir is None or type(base_dir) == str # noqa: E721

		node = PostgresNode(
		name=name,
		base_dir=base_dir,
		conn_params=None,
		bin_dir=self._bin_dir,
		prefix=self._prefix,
		os_ops=self._os_ops)

		return node

		@property
		def base_dir(self):
		# NOTE: it's safe to create a new dir
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -163,6 +163,9 @@ def __repr__(self):
		return "{}(name='{}', port={}, base_dir='{}')".format(
		self.__class__.__name__, self.name, self.port, self.base_dir)

		def clone_with_new_name_and_base_dir(self, name: str, base_dir: str):
		raise NotImplementedError("PostgresNode_Base::clone_with_new_name_and_base_dir is not implemented")

		@property
		def pid(self):
		"""
Expand Down