Skip to content

Commit 6845292

Browse files
cleanup: PostgresNode does not support conn_params at all (#356)
Note that it is a critical change. PostgresNode::__init__ - [del] argument conn_params NodeBackup::spawn_primary - always uses node.clone_with_new_name_and_base_dir to create a cloned object
1 parent a8a0f68 commit 6845292

2 files changed

Lines changed: 1 addition & 13 deletions

File tree

src/backup.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,7 @@ def spawn_primary(self, name=None, destroy=True):
152152
# Build a new PostgresNode
153153
assert self.original_node is not None
154154

155-
if (hasattr(self.original_node, "clone_with_new_name_and_base_dir")):
156-
node = self.original_node.clone_with_new_name_and_base_dir(name=name, base_dir=base_dir)
157-
else:
158-
# For backward compatibility
159-
NodeClass = self.original_node.__class__
160-
node = NodeClass(name=name, base_dir=base_dir, conn_params=self.original_node.os_ops.conn_params)
155+
node = self.original_node.clone_with_new_name_and_base_dir(name=name, base_dir=base_dir)
161156

162157
assert node is not None
163158
assert type(node) is self.original_node.__class__

src/node.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@
101101

102102
from .backup import NodeBackup
103103

104-
from testgres.operations.os_ops import ConnectionParams
105104
from testgres.operations.os_ops import OsOperations
106105
from testgres.operations.local_ops import LocalOperations
107106

@@ -174,7 +173,6 @@ def __init__(self,
174173
name=None,
175174
base_dir=None,
176175
port: typing.Optional[int] = None,
177-
conn_params: typing.Optional[ConnectionParams] = None,
178176
bin_dir=None,
179177
prefix=None,
180178
os_ops: typing.Optional[OsOperations] = None,
@@ -194,11 +192,6 @@ def __init__(self,
194192
assert os_ops is None or isinstance(os_ops, OsOperations)
195193
assert port_manager is None or isinstance(port_manager, PortManager)
196194

197-
if conn_params is not None:
198-
assert type(conn_params) is ConnectionParams
199-
200-
raise InvalidOperationException("conn_params is deprecated, please use os_ops parameter instead.")
201-
202195
# private
203196
if os_ops is None:
204197
self._os_ops = __class__._get_os_ops()

0 commit comments

Comments
 (0)