Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc5ad907

Browse files
PostgresNodePortManager was renamed with PortManager
1 parentb1cee19 commitc5ad907

File tree

7 files changed

+40
-37
lines changed

7 files changed

+40
-37
lines changed

‎testgres/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
DumpFormat
3535

3636
from .nodeimportPostgresNode,NodeApp
37-
from .nodeimportPostgresNodePortManager
37+
from .nodeimportPortManager
3838

3939
from .utilsimport \
4040
reserve_port, \
@@ -63,7 +63,7 @@
6363
"TestgresException","ExecUtilException","QueryException","TimeoutException","CatchUpException","StartNodeException","InitNodeException","BackupException","InvalidOperationException",
6464
"XLogMethod","IsolationLevel","NodeStatus","ProcessType","DumpFormat",
6565
"PostgresNode","NodeApp",
66-
"PostgresNodePortManager",
66+
"PortManager",
6767
"reserve_port","release_port","bound_ports","get_bin_path","get_pg_config","get_pg_version",
6868
"First","Any",
6969
"OsOperations","LocalOperations","RemoteOperations","ConnectionParams"

‎testgres/node.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@
8383
BackupException, \
8484
InvalidOperationException
8585

86-
from .port_managerimportPostgresNodePortManager
87-
from .port_managerimportPostgresNodePortManager__ThisHost
88-
from .port_managerimportPostgresNodePortManager__Generic
86+
from .port_managerimportPortManager
87+
from .port_managerimportPortManager__ThisHost
88+
from .port_managerimportPortManager__Generic
8989

9090
from .loggerimportTestgresLogger
9191

@@ -146,7 +146,7 @@ class PostgresNode(object):
146146
_port:typing.Optional[int]
147147
_should_free_port:bool
148148
_os_ops:OsOperations
149-
_port_manager:PostgresNodePortManager
149+
_port_manager:PortManager
150150

151151
def__init__(self,
152152
name=None,
@@ -156,7 +156,7 @@ def __init__(self,
156156
bin_dir=None,
157157
prefix=None,
158158
os_ops:typing.Optional[OsOperations]=None,
159-
port_manager:typing.Optional[PostgresNodePortManager]=None):
159+
port_manager:typing.Optional[PortManager]=None):
160160
"""
161161
PostgresNode constructor.
162162
@@ -170,7 +170,7 @@ def __init__(self,
170170
"""
171171
assertportisNoneortype(port)==int# noqa: E721
172172
assertos_opsisNoneorisinstance(os_ops,OsOperations)
173-
assertport_managerisNoneorisinstance(port_manager,PostgresNodePortManager)
173+
assertport_managerisNoneorisinstance(port_manager,PortManager)
174174

175175
# private
176176
ifos_opsisNone:
@@ -203,13 +203,13 @@ def __init__(self,
203203
self._port_manager=None
204204
else:
205205
ifport_managerisnotNone:
206-
assertisinstance(port_manager,PostgresNodePortManager)
206+
assertisinstance(port_manager,PortManager)
207207
self._port_manager=port_manager
208208
else:
209209
self._port_manager=__class__._get_port_manager(self._os_ops)
210210

211211
assertself._port_managerisnotNone
212-
assertisinstance(self._port_manager,PostgresNodePortManager)
212+
assertisinstance(self._port_manager,PortManager)
213213

214214
self._port=self._port_manager.reserve_port()# raises
215215
asserttype(self._port)==int# noqa: E721
@@ -269,15 +269,15 @@ def _get_os_ops(conn_params: ConnectionParams) -> OsOperations:
269269
returnLocalOperations(conn_params)
270270

271271
@staticmethod
272-
def_get_port_manager(os_ops:OsOperations)->PostgresNodePortManager:
272+
def_get_port_manager(os_ops:OsOperations)->PortManager:
273273
assertos_opsisnotNone
274274
assertisinstance(os_ops,OsOperations)
275275

276276
ifisinstance(os_ops,LocalOperations):
277-
returnPostgresNodePortManager__ThisHost()
277+
returnPortManager__ThisHost()
278278

279279
# TODO: Throw exception "Please define a port manager."
280-
returnPostgresNodePortManager__Generic(os_ops)
280+
returnPortManager__Generic(os_ops)
281281

282282
defclone_with_new_name_and_base_dir(self,name:str,base_dir:str):
283283
assertnameisNoneortype(name)==str# noqa: E721
@@ -289,7 +289,7 @@ def clone_with_new_name_and_base_dir(self, name: str, base_dir: str):
289289
raiseInvalidOperationException("PostgresNode without PortManager can't be cloned.")
290290

291291
assertself._port_managerisnotNone
292-
assertisinstance(self._port_manager,PostgresNodePortManager)
292+
assertisinstance(self._port_manager,PortManager)
293293
assertself._os_opsisnotNone
294294
assertisinstance(self._os_ops,OsOperations)
295295

@@ -1124,7 +1124,7 @@ def LOCAL__raise_cannot_start_node__std(from_exception):
11241124
else:
11251125
assertself._should_free_port
11261126
assertself._port_managerisnotNone
1127-
assertisinstance(self._port_manager,PostgresNodePortManager)
1127+
assertisinstance(self._port_manager,PortManager)
11281128
assert__class__._C_MAX_START_ATEMPTS>1
11291129

11301130
log_files0=self._collect_log_files()
@@ -1331,7 +1331,7 @@ def free_port(self):
13311331
asserttype(self._port)==int# noqa: E721
13321332

13331333
assertself._port_managerisnotNone
1334-
assertisinstance(self._port_manager,PostgresNodePortManager)
1334+
assertisinstance(self._port_manager,PortManager)
13351335

13361336
port=self._port
13371337
self._should_free_port=False

‎testgres/port_manager.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@
88
importrandom
99

1010

11-
classPostgresNodePortManager:
11+
classPortManager:
1212
def__init__(self):
1313
super().__init__()
1414

1515
defreserve_port(self)->int:
16-
raiseNotImplementedError("PostgresNodePortManager::reserve_port is not implemented.")
16+
raiseNotImplementedError("PortManager::reserve_port is not implemented.")
1717

1818
defrelease_port(self,number:int)->None:
1919
asserttype(number)==int# noqa: E721
20-
raiseNotImplementedError("PostgresNodePortManager::release_port is not implemented.")
20+
raiseNotImplementedError("PortManager::release_port is not implemented.")
2121

2222

23-
classPostgresNodePortManager__ThisHost(PostgresNodePortManager):
24-
sm_single_instance:PostgresNodePortManager=None
23+
classPortManager__ThisHost(PortManager):
24+
sm_single_instance:PortManager=None
2525
sm_single_instance_guard=threading.Lock()
2626

2727
def__init__(self):
2828
pass
2929

30-
def__new__(cls)->PostgresNodePortManager:
31-
assert__class__==PostgresNodePortManager__ThisHost
30+
def__new__(cls)->PortManager:
31+
assert__class__==PortManager__ThisHost
3232
assert__class__.sm_single_instance_guardisnotNone
3333

3434
if__class__.sm_single_instanceisNone:
@@ -46,7 +46,7 @@ def release_port(self, number: int) -> None:
4646
returnutils.release_port(number)
4747

4848

49-
classPostgresNodePortManager__Generic(PostgresNodePortManager):
49+
classPortManager__Generic(PortManager):
5050
_os_ops:OsOperations
5151
_allocated_ports_guard:object
5252
_allocated_ports:set[int]

‎testgres/utils.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ def internal__release_port(port):
7272
Free port provided by reserve_port().
7373
"""
7474

75+
asserttype(port)==int# noqa: E721
76+
assertportinbound_ports
77+
7578
bound_ports.discard(port)
7679

7780

‎tests/helpers/global_data.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
from ...testgres.operations.local_opsimportLocalOperations
44
from ...testgres.operations.remote_opsimportRemoteOperations
55

6-
from ...testgres.nodeimportPostgresNodePortManager
7-
from ...testgres.nodeimportPostgresNodePortManager__ThisHost
8-
from ...testgres.nodeimportPostgresNodePortManager__Generic
6+
from ...testgres.nodeimportPortManager
7+
from ...testgres.nodeimportPortManager__ThisHost
8+
from ...testgres.nodeimportPortManager__Generic
99

1010
importos
1111

@@ -37,22 +37,22 @@ class OsOpsDescrs:
3737

3838

3939
classPortManagers:
40-
sm_remote_port_manager=PostgresNodePortManager__Generic(OsOpsDescrs.sm_remote_os_ops)
40+
sm_remote_port_manager=PortManager__Generic(OsOpsDescrs.sm_remote_os_ops)
4141

42-
sm_local_port_manager=PostgresNodePortManager__ThisHost()
42+
sm_local_port_manager=PortManager__ThisHost()
4343

44-
sm_local2_port_manager=PostgresNodePortManager__Generic(OsOpsDescrs.sm_local_os_ops)
44+
sm_local2_port_manager=PortManager__Generic(OsOpsDescrs.sm_local_os_ops)
4545

4646

4747
classPostgresNodeService:
4848
sign:str
4949
os_ops:OsOperations
50-
port_manager:PostgresNodePortManager
50+
port_manager:PortManager
5151

52-
def__init__(self,sign:str,os_ops:OsOperations,port_manager:PostgresNodePortManager):
52+
def__init__(self,sign:str,os_ops:OsOperations,port_manager:PortManager):
5353
asserttype(sign)==str# noqa: E721
5454
assertisinstance(os_ops,OsOperations)
55-
assertisinstance(port_manager,PostgresNodePortManager)
55+
assertisinstance(port_manager,PortManager)
5656
self.sign=sign
5757
self.os_ops=os_ops
5858
self.port_manager=port_manager

‎tests/test_testgres_common.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from .helpers.global_dataimportPostgresNodeService
22
from .helpers.global_dataimportPostgresNodeServices
33
from .helpers.global_dataimportOsOperations
4-
from .helpers.global_dataimportPostgresNodePortManager
4+
from .helpers.global_dataimportPortManager
55

66
from ..testgres.nodeimportPgVer
77
from ..testgres.nodeimportPostgresNode
@@ -70,7 +70,7 @@ def node_svc(self, request: pytest.FixtureRequest) -> PostgresNodeService:
7070
assertisinstance(request,pytest.FixtureRequest)
7171
assertisinstance(request.param,PostgresNodeService)
7272
assertisinstance(request.param.os_ops,OsOperations)
73-
assertisinstance(request.param.port_manager,PostgresNodePortManager)
73+
assertisinstance(request.param.port_manager,PortManager)
7474
returnrequest.param
7575

7676
deftest_version_management(self,node_svc:PostgresNodeService):
@@ -1125,7 +1125,7 @@ def test_pgbench(self, node_svc: PostgresNodeService):
11251125
defhelper__get_node(node_svc:PostgresNodeService,name=None):
11261126
assertisinstance(node_svc,PostgresNodeService)
11271127
assertisinstance(node_svc.os_ops,OsOperations)
1128-
assertisinstance(node_svc.port_manager,PostgresNodePortManager)
1128+
assertisinstance(node_svc.port_manager,PortManager)
11291129
returnPostgresNode(
11301130
name,
11311131
conn_params=None,

‎tests/test_testgres_remote.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ def helper__get_node(name=None):
246246

247247
assertisinstance(svc,PostgresNodeService)
248248
assertisinstance(svc.os_ops,testgres.OsOperations)
249-
assertisinstance(svc.port_manager,testgres.PostgresNodePortManager)
249+
assertisinstance(svc.port_manager,testgres.PortManager)
250250

251251
returntestgres.PostgresNode(
252252
name,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp