psw/borgmatic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed spurious, intermittent test failures related to command execution and logging.

Browse source
This commit is contained in:
Dan Helfman 2022-08-28 09:06:06 -07:00
parent 80b8c25bba
commit 87c97b7568
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
borgmatic/execute.py
View file

@ -69,6 +69,7 @@ def log_outputs(processes, exclude_stdouts, output_log_level, borg_local_path):
} }
output_buffers = list(process_for_output_buffer.keys()) output_buffers = list(process_for_output_buffer.keys())
captured_outputs = collections.defaultdict(list) captured_outputs = collections.defaultdict(list)
still_running = True
# Log output for each process until they all exit. # Log output for each process until they all exit.
while True: while True:
@ -108,6 +109,9 @@ def log_outputs(processes, exclude_stdouts, output_log_level, borg_local_path):
else: else:
logger.log(output_log_level, line) logger.log(output_log_level, line)
if not still_running:
break
still_running = False still_running = False
for process in processes: for process in processes:
@ -137,9 +141,6 @@ def log_outputs(processes, exclude_stdouts, output_log_level, borg_local_path):
exit_code, command_for_process(process), '\n'.join(last_lines) exit_code, command_for_process(process), '\n'.join(last_lines)
) )
if not still_running:
break
if captured_outputs: if captured_outputs:
return { return {
process: '\n'.join(output_lines) for process, output_lines in captured_outputs.items() process: '\n'.join(output_lines) for process, output_lines in captured_outputs.items()

2
tests/integration/test_execute.py
View file

@ -278,7 +278,7 @@ def test_log_outputs_with_unfinished_process_re_polls():
flexmock(module).should_receive('exit_code_indicates_error').and_return(False) flexmock(module).should_receive('exit_code_indicates_error').and_return(False)
process = subprocess.Popen(['true'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) process = subprocess.Popen(['true'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
flexmock(process).should_receive('poll').and_return(None).and_return(0).twice() flexmock(process).should_receive('poll').and_return(None).and_return(0).times(3)
flexmock(module).should_receive('output_buffer_for_process').and_return(process.stdout) flexmock(module).should_receive('output_buffer_for_process').and_return(process.stdout)
module.log_outputs( module.log_outputs(