Skip to content

Commit 860160f

Browse files
committed
tests/library/harness: get rid of warnings on unclosed files
1 parent ed4cd96 commit 860160f

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

ydb/tests/library/harness/daemon.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ def __init__(
6262
stderr_file="/dev/null",
6363
stderr_on_error_lines=0,
6464
core_pattern=None,
65+
templog_file=None
6566
):
6667
self.__cwd = cwd
6768
self.__timeout = timeout
@@ -73,6 +74,7 @@ def __init__(
7374
self.logger = logger.getChild(self.__class__.__name__)
7475
self.__stdout_file = open(stdout_file, mode='wb')
7576
self.__stderr_file = open(stderr_file, mode='wb')
77+
self.__templog_file = templog_file
7678

7779
@property
7880
def daemon(self):
@@ -92,6 +94,12 @@ def stderr_file_name(self):
9294
else:
9395
return None
9496

97+
def __close_open_files(self):
98+
self.__stdout_file.close()
99+
self.__stderr_file.close()
100+
if self.__templog_file is not None:
101+
self.__templog_file.close()
102+
95103
def is_alive(self):
96104
return self.__daemon is not None and self.__daemon.running
97105

@@ -112,6 +120,7 @@ def start(self):
112120

113121
if not self.is_alive():
114122
self.__check_before_fail()
123+
self.__close_open_files()
115124
raise DaemonError(
116125
"Unexpectedly finished on start",
117126
exit_code=self.__daemon.exit_code,
@@ -162,6 +171,8 @@ def __check_before_end_stop(self, stop_type):
162171
stderr=self.stderr_file_name,
163172
max_stderr_lines=self.__stderr_on_error_lines,
164173
)
174+
else:
175+
self.__close_open_files()
165176

166177
def stop(self):
167178
if not self.__check_can_launch_stop("stop"):

ydb/tests/library/harness/kikimr_runner.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,11 @@ def __init__(self, node_id, config_path, port_allocator, cluster_name, configura
8989
)
9090

9191
if configurator.use_log_files:
92-
self.__log_file = tempfile.NamedTemporaryFile(dir=self.__working_dir, prefix="logfile_", suffix=".log", delete=False)
92+
self.__log_file = tempfile.NamedTemporaryFile(dir=self.__working_dir, prefix="logfile_", suffix=".log", delete=False, delete_on_close=False)
9393
kwargs = {
9494
"stdout_file": os.path.join(self.__working_dir, "stdout"),
95-
"stderr_file": os.path.join(self.__working_dir, "stderr")
95+
"stderr_file": os.path.join(self.__working_dir, "stderr"),
96+
"templog_file": self.__log_file,
9697
}
9798
else:
9899
self.__log_file = None

0 commit comments

Comments
 (0)