Commita5d6df4

authored

[BUG FIX] PostgresNode must use get_pg_version2 (#227)

1 parentbc18e5b commita5d6df4Copy full SHA for a5d6df4

File tree

+12

-11

lines changed

+12

-11

lines changed

Lines changed: 12 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@`
`92`	`92`	`PgVer, \`
`93`	`93`	`eprint, \`
`94`	`94`	`get_bin_path2, \`
`95`		`-get_pg_version, \`
	`95`	`+get_pg_version2, \`
`96`	`96`	`execute_utility2, \`
`97`	`97`	`options_string, \`
`98`	`98`	`clean_on_error`
`@@ -148,16 +148,6 @@ def __init__(self, name=None, base_dir=None, port=None, conn_params: ConnectionP`
`148`	`148`	`"""`
`149`	`149`
`150`	`150`	`# private`
`151`		`-self._pg_version=PgVer(get_pg_version(bin_dir))`
`152`		`-self._should_free_port=portisNone`
`153`		`-self._base_dir=base_dir`
`154`		`-self._bin_dir=bin_dir`
`155`		`-self._prefix=prefix`
`156`		`-self._logger=None`
`157`		`-self._master=None`
`158`		`-`
`159`		`-# basic`
`160`		`-self.name=nameorgenerate_app_name()`
`161`	`151`	`ifos_opsisNone:`
`162`	`152`	`os_ops=__class__._get_os_ops(conn_params)`
`163`	`153`	`else:`
`@@ -168,6 +158,17 @@ def __init__(self, name=None, base_dir=None, port=None, conn_params: ConnectionP`
`168`	`158`	`assertisinstance(os_ops,OsOperations)`
`169`	`159`	`self._os_ops=os_ops`
`170`	`160`
	`161`	`+self._pg_version=PgVer(get_pg_version2(os_ops,bin_dir))`
	`162`	`+self._should_free_port=portisNone`
	`163`	`+self._base_dir=base_dir`
	`164`	`+self._bin_dir=bin_dir`
	`165`	`+self._prefix=prefix`
	`166`	`+self._logger=None`
	`167`	`+self._master=None`
	`168`	`+`
	`169`	`+# basic`
	`170`	`+self.name=nameorgenerate_app_name()`
	`171`	`+`
`171`	`172`	`self.host=os_ops.host`
`172`	`173`	`self.port=portorutils.reserve_port()`
`173`	`174`

Comments

(0)