Skip to content

Commit eed89f7

Browse files
dmitry-lipetskdmitry-lipetsk
committed
PostgresNodeTestUtils.get_node is added
1 parent 0b88bf3 commit eed89f7

File tree

3 files changed

+48
-34
lines changed

3 files changed

+48
-34
lines changed

‎tests/helpers/pg_node_utils.py‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
from src import PostgresNode
2+
from src import PortManager
3+
from src import OsOperations
24
from src import NodeStatus
35
from src.node import PostgresNodeLogReader
46

57
from tests.helpers.utils import Utils as HelperUtils
68
from tests.helpers.utils import T_WAIT_TIME
79

10+
from tests.helpers.global_data import PostgresNodeService
11+
812
import typing
913

1014

@@ -123,6 +127,28 @@ def __repr__(self) -> str:
123127
assert type(r) == str # noqa: E721
124128
return r
125129

130+
# --------------------------------------------------------------------
131+
@staticmethod
132+
def get_node(
133+
node_svc: PostgresNodeService,
134+
name: typing.Optional[str] = None,
135+
port: typing.Optional[int] = None,
136+
port_manager: typing.Optional[PortManager] = None
137+
) -> PostgresNode:
138+
assert isinstance(node_svc, PostgresNodeService)
139+
assert isinstance(node_svc.os_ops, OsOperations)
140+
assert isinstance(node_svc.port_manager, PortManager)
141+
142+
if port_manager is None:
143+
port_manager = node_svc.port_manager
144+
145+
return PostgresNode(
146+
name,
147+
port=port,
148+
os_ops=node_svc.os_ops,
149+
port_manager=port_manager if port is None else None
150+
)
151+
126152
# --------------------------------------------------------------------
127153
@staticmethod
128154
def wait_for_running_state(

‎tests/units/node/PostgresNode/test_setM001__start.py‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
from tests.helpers.utils import Utils as HelperUtils
88
from tests.helpers.pg_node_utils import PostgresNodeUtils as PostgresNodeTestUtils
99

10-
from src import NodeStatus
1110
from src import PostgresNode
11+
from src import NodeStatus
1212
from src import NodeConnection
1313

1414
from src.node import PostgresNodeLogReader
@@ -61,7 +61,8 @@ def test_001__wait_true(
6161
assert type(data001) == __class__.tagData001 # noqa: E721
6262
assert data001.wait is None or type(data001.wait) == bool # noqa: E721
6363

64-
with __class__.helper__get_node(node_svc) as node:
64+
with PostgresNodeTestUtils.get_node(node_svc) as node:
65+
assert type(node) == PostgresNode # noqa: E721
6566
node.init()
6667
assert not node.is_started
6768
assert node.status() == NodeStatus.Stopped
@@ -105,7 +106,8 @@ def test_002__wait_false(self, node_svc: PostgresNodeService):
105106
if attempt > 1:
106107
HelperUtils.PrintAndSleep(5)
107108

108-
with __class__.helper__get_node(node_svc) as node:
109+
with PostgresNodeTestUtils.get_node(node_svc) as node:
110+
assert type(node) == PostgresNode # noqa: E721
109111
node.init()
110112
assert not node.is_started
111113
assert node.status() == NodeStatus.Stopped
@@ -144,7 +146,8 @@ def test_003__exec_env(
144146
):
145147
assert isinstance(node_svc, PostgresNodeService)
146148

147-
with __class__.helper__get_node(node_svc) as node:
149+
with PostgresNodeTestUtils.get_node(node_svc) as node:
150+
assert type(node) == PostgresNode # noqa: E721
148151
node.init()
149152
assert not node.is_started
150153
assert node.status() == NodeStatus.Stopped
@@ -185,7 +188,8 @@ def test_004__params_is_None(
185188
):
186189
assert isinstance(node_svc, PostgresNodeService)
187190

188-
with __class__.helper__get_node(node_svc) as node:
191+
with PostgresNodeTestUtils.get_node(node_svc) as node:
192+
assert type(node) == PostgresNode # noqa: E721
189193
node.init()
190194
assert not node.is_started
191195
assert node.status() == NodeStatus.Stopped
@@ -201,7 +205,8 @@ def test_005__params_is_empty(
201205
):
202206
assert isinstance(node_svc, PostgresNodeService)
203207

204-
with __class__.helper__get_node(node_svc) as node:
208+
with PostgresNodeTestUtils.get_node(node_svc) as node:
209+
assert type(node) == PostgresNode # noqa: E721
205210
node.init()
206211
assert not node.is_started
207212
assert node.status() == NodeStatus.Stopped
@@ -210,14 +215,3 @@ def test_005__params_is_empty(
210215
assert node.is_started
211216
assert node.status() == NodeStatus.Running
212217
return
213-
214-
@staticmethod
215-
def helper__get_node(
216-
node_svc: PostgresNodeService,
217-
) -> PostgresNode:
218-
assert isinstance(node_svc, PostgresNodeService)
219-
220-
return PostgresNode(
221-
os_ops=node_svc.os_ops,
222-
port_manager=node_svc.port_manager,
223-
)

‎tests/units/node/PostgresNode/test_setM002__start2.py‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
from tests.helpers.utils import Utils as HelperUtils
88
from tests.helpers.pg_node_utils import PostgresNodeUtils as PostgresNodeTestUtils
99

10-
from src import NodeStatus
1110
from src import PostgresNode
11+
from src import NodeStatus
1212
from src import NodeConnection
1313

1414
from src.node import PostgresNodeLogReader
@@ -61,7 +61,8 @@ def test_001__wait_true(
6161
assert type(data001) == __class__.tagData001 # noqa: E721
6262
assert data001.wait is None or type(data001.wait) == bool # noqa: E721
6363

64-
with __class__.helper__get_node(node_svc) as node:
64+
with PostgresNodeTestUtils.get_node(node_svc) as node:
65+
assert type(node) == PostgresNode # noqa: E721
6566
node.init()
6667
assert not node.is_started
6768
assert node.status() == NodeStatus.Stopped
@@ -100,7 +101,8 @@ def test_002__wait_false(self, node_svc: PostgresNodeService):
100101
if attempt > 1:
101102
HelperUtils.PrintAndSleep(5)
102103

103-
with __class__.helper__get_node(node_svc) as node:
104+
with PostgresNodeTestUtils.get_node(node_svc) as node:
105+
assert type(node) == PostgresNode # noqa: E721
104106
node.init()
105107
assert not node.is_started
106108
assert node.status() == NodeStatus.Stopped
@@ -138,7 +140,8 @@ def test_003__exec_env(
138140
):
139141
assert isinstance(node_svc, PostgresNodeService)
140142

141-
with __class__.helper__get_node(node_svc) as node:
143+
with PostgresNodeTestUtils.get_node(node_svc) as node:
144+
assert type(node) == PostgresNode # noqa: E721
142145
node.init()
143146
assert not node.is_started
144147
assert node.status() == NodeStatus.Stopped
@@ -179,7 +182,8 @@ def test_004__params_is_None(
179182
):
180183
assert isinstance(node_svc, PostgresNodeService)
181184

182-
with __class__.helper__get_node(node_svc) as node:
185+
with PostgresNodeTestUtils.get_node(node_svc) as node:
186+
assert type(node) == PostgresNode # noqa: E721
183187
node.init()
184188
assert not node.is_started
185189
assert node.status() == NodeStatus.Stopped
@@ -195,7 +199,8 @@ def test_005__params_is_empty(
195199
):
196200
assert isinstance(node_svc, PostgresNodeService)
197201

198-
with __class__.helper__get_node(node_svc) as node:
202+
with PostgresNodeTestUtils.get_node(node_svc) as node:
203+
assert type(node) == PostgresNode # noqa: E721
199204
node.init()
200205
assert not node.is_started
201206
assert node.status() == NodeStatus.Stopped
@@ -204,14 +209,3 @@ def test_005__params_is_empty(
204209
assert node.is_started
205210
assert node.status() == NodeStatus.Running
206211
return
207-
208-
@staticmethod
209-
def helper__get_node(
210-
node_svc: PostgresNodeService,
211-
) -> PostgresNode:
212-
assert isinstance(node_svc, PostgresNodeService)
213-
214-
return PostgresNode(
215-
os_ops=node_svc.os_ops,
216-
port_manager=node_svc.port_manager,
217-
)

0 commit comments

Comments
 (0)