Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,6 @@ def __init__(
self.cleanup_on_bad_exit = testgres_config.node_cleanup_on_bad_exit
self.shutdown_max_attempts = 3

# NOTE: for compatibility
self.utils_log_name = self.utils_log_file
self.pg_log_name = self.pg_log_file

# Node state
self._manually_started_pm_pid = None

Expand Down Expand Up @@ -559,6 +555,16 @@ def pg_log_file(self):
assert type(path) is str
return path

# NOTE: for compatibility
@property
def utils_log_name(self) -> str:
return self.utils_log_file

# NOTE: for compatibility
@property
def pg_log_name(self) -> str:
return self.pg_log_file

@property
def version(self):
"""
Expand Down Expand Up @@ -1639,7 +1645,7 @@ def restore(self, filename, dbname=None, username=None):

# try pg_restore if dump is binary format, and psql if not
try:
execute_utility2(self._os_ops, _params, self.utils_log_name)
execute_utility2(self._os_ops, _params, self.utils_log_file)
except ExecUtilException:
self.psql(filename=filename, dbname=dbname, username=username)

Expand Down
12 changes: 12 additions & 0 deletions tests/test_testgres_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,18 @@ def test_version_management(self, node_svc: PostgresNodeService):
assert (isinstance(node.version, PgVer))
assert (node.version == PgVer(version))

def test_node_constructor__default(self):
node = PostgresNode()
assert node._os_ops is not None
assert isinstance(node._os_ops, OsOperations)
assert node._port_manager is not None
assert isinstance(node._port_manager, PortManager)
assert node._name is not None
assert type(node._name) is str
assert node._name != ""
assert node._base_dir is None
return

def test_node_constructor__host(self):
C_HOST = "AbCdE"

Expand Down