diff --git a/testgres/node.py b/testgres/node.py index 6d2417c4..2b5fc6d1 100644 --- a/testgres/node.py +++ b/testgres/node.py @@ -92,7 +92,7 @@ PgVer, \ eprint, \ get_bin_path2, \ - get_pg_version, \ + get_pg_version2, \ execute_utility2, \ options_string, \ clean_on_error @@ -148,16 +148,6 @@ def __init__(self, name=None, base_dir=None, port=None, conn_params: ConnectionP """ # private - self._pg_version = PgVer(get_pg_version(bin_dir)) - self._should_free_port = port is None - self._base_dir = base_dir - self._bin_dir = bin_dir - self._prefix = prefix - self._logger = None - self._master = None - - # basic - self.name = name or generate_app_name() if os_ops is None: os_ops = __class__._get_os_ops(conn_params) else: @@ -168,6 +158,17 @@ def __init__(self, name=None, base_dir=None, port=None, conn_params: ConnectionP assert isinstance(os_ops, OsOperations) self._os_ops = os_ops + self._pg_version = PgVer(get_pg_version2(os_ops, bin_dir)) + self._should_free_port = port is None + self._base_dir = base_dir + self._bin_dir = bin_dir + self._prefix = prefix + self._logger = None + self._master = None + + # basic + self.name = name or generate_app_name() + self.host = os_ops.host self.port = port or utils.reserve_port()