NotificationsYou must be signed in to change notification settings
Fork35
Star144

Commit6972bfc

authored

[#244] PostgresNode now uses os_ops only (#245)

This patch implements the proposal#244 - detach PostgresNode from ConnectionParams object.It will use os_ops object only.conn_params is saved but must be None. It will be removed in the future.

1 parenta683c65 commit6972bfcCopy full SHA for 6972bfc

File tree

3 files changed

+15

-17

lines changed

testgres
- node.py
tests
- test_testgres_common.py
- test_testgres_remote.py

3 files changed

+15

-17

lines changed

`‎testgres/node.py`

Lines changed: 15 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,6 @@`
`107`	`107`	`from .operations.os_opsimportConnectionParams`
`108`	`108`	`from .operations.os_opsimportOsOperations`
`109`	`109`	`from .operations.local_opsimportLocalOperations`
`110`		`-from .operations.remote_opsimportRemoteOperations`
`111`	`110`
`112`	`111`	`InternalError=pglib.InternalError`
`113`	`112`	`ProgrammingError=pglib.ProgrammingError`
`@@ -151,7 +150,7 @@ def __init__(self,`
`151`	`150`	`name=None,`
`152`	`151`	`base_dir=None,`
`153`	`152`	`port:typing.Optional[int]=None,`
`154`		`-conn_params:ConnectionParams=ConnectionParams(),`
	`153`	`+conn_params:ConnectionParams=None,`
`155`	`154`	`bin_dir=None,`
`156`	`155`	`prefix=None,`
`157`	`156`	`os_ops:typing.Optional[OsOperations]=None,`
`@@ -171,11 +170,15 @@ def __init__(self,`
`171`	`170`	`assertos_opsisNoneorisinstance(os_ops,OsOperations)`
`172`	`171`	`assertport_managerisNoneorisinstance(port_manager,PortManager)`
`173`	`172`
	`173`	`+ifconn_paramsisnotNone:`
	`174`	`+asserttype(conn_params)==ConnectionParams# noqa: E721`
	`175`	`+`
	`176`	`+raiseInvalidOperationException("conn_params is deprecated, please use os_ops parameter instead.")`
	`177`	`+`
`174`	`178`	`# private`
`175`	`179`	`ifos_opsisNone:`
`176`		`-self._os_ops=__class__._get_os_ops(conn_params)`
	`180`	`+self._os_ops=__class__._get_os_ops()`
`177`	`181`	`else:`
`178`		`-assertconn_paramsisNone`
`179`	`182`	`assertisinstance(os_ops,OsOperations)`
`180`	`183`	`self._os_ops=os_ops`
`181`	`184`	`pass`
`@@ -200,11 +203,14 @@ def __init__(self,`
`200`	`203`	`self._should_free_port=False`
`201`	`204`	`self._port_manager=None`
`202`	`205`	`else:`
`203`		`-ifport_managerisnotNone:`
	`206`	`+ifport_managerisNone:`
	`207`	`+self._port_manager=__class__._get_port_manager(self._os_ops)`
	`208`	`+elifos_opsisNone:`
	`209`	`+raiseInvalidOperationException("When port_manager is not None you have to define os_ops, too.")`
	`210`	`+else:`
`204`	`211`	`assertisinstance(port_manager,PortManager)`
	`212`	`+assertself._os_opsisos_ops`
`205`	`213`	`self._port_manager=port_manager`
`206`		`-else:`
`207`		`-self._port_manager=__class__._get_port_manager(self._os_ops)`
`208`	`214`
`209`	`215`	`assertself._port_managerisnotNone`
`210`	`216`	`assertisinstance(self._port_manager,PortManager)`
`@@ -255,16 +261,11 @@ def __repr__(self):`
`255`	`261`	`)`
`256`	`262`
`257`	`263`	`@staticmethod`
`258`		`-def_get_os_ops(conn_params:ConnectionParams)->OsOperations:`
	`264`	`+def_get_os_ops()->OsOperations:`
`259`	`265`	`iftestgres_config.os_ops:`
`260`	`266`	`returntestgres_config.os_ops`
`261`	`267`
`262`		`-asserttype(conn_params)==ConnectionParams# noqa: E721`
`263`		`-`
`264`		`-ifconn_params.ssh_key:`
`265`		`-returnRemoteOperations(conn_params)`
`266`		`-`
`267`		`-returnLocalOperations(conn_params)`
	`268`	`+returnLocalOperations()`
`268`	`269`
`269`	`270`	`@staticmethod`
`270`	`271`	`def_get_port_manager(os_ops:OsOperations)->PortManager:`
`@@ -294,7 +295,6 @@ def clone_with_new_name_and_base_dir(self, name: str, base_dir: str):`
`294`	`295`	`node=PostgresNode(`
`295`	`296`	`name=name,`
`296`	`297`	`base_dir=base_dir,`
`297`		`-conn_params=None,`
`298`	`298`	`bin_dir=self._bin_dir,`
`299`	`299`	`prefix=self._prefix,`
`300`	`300`	`os_ops=self._os_ops,`

`‎tests/test_testgres_common.py`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1487,7 +1487,6 @@ def helper__get_node(`
`1487`	`1487`	`returnPostgresNode(`
`1488`	`1488`	`name,`
`1489`	`1489`	`port=port,`
`1490`		`-conn_params=None,`
`1491`	`1490`	`os_ops=node_svc.os_ops,`
`1492`	`1491`	`port_manager=port_managerifportisNoneelseNone`
`1493`	`1492`	`)`

`‎tests/test_testgres_remote.py`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,6 @@ def helper__get_node(name=None):`
`173`	`173`
`174`	`174`	`returntestgres.PostgresNode(`
`175`	`175`	`name,`
`176`		`-conn_params=None,`
`177`	`176`	`os_ops=svc.os_ops,`
`178`	`177`	`port_manager=svc.port_manager)`
`179`	`178`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6972bfc

File tree

3 files changed

3 files changed

`‎testgres/node.py`

`‎tests/test_testgres_common.py`

`‎tests/test_testgres_remote.py`

0 commit comments