diff --git a/src/node.py b/src/node.py index 148cae89..5c8ada32 100644 --- a/src/node.py +++ b/src/node.py @@ -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 @@ -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): """ @@ -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) diff --git a/tests/test_testgres_common.py b/tests/test_testgres_common.py index 855d24c8..3f289817 100644 --- a/tests/test_testgres_common.py +++ b/tests/test_testgres_common.py @@ -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"