borgmatic-collective/borgmatic
borgmatic-collective
/
borgmatic
14
58
Fork 42
Code Issues 58 Pull Requests 3 Actions Packages Releases 122 Activity

`list_archives()` uses `subprocess.check_output()` 

instead of `subprocess.check_call(..., stdout=temp_file)`
This commit is contained in:
Thomas LÉVEIL 2018-07-23 00:58:35 +02:00
parent 76b5953959
commit 7a4c41c12c
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
borgmatic/borg/list.py
View File

@ -1,7 +1,5 @@
import logging
import subprocess
import sys
import tempfile
from borgmatic.verbosity import VERBOSITY_SOME, VERBOSITY_LOTS
@ -29,7 +27,5 @@ def list_archives(verbosity, repository, storage_config, local_path='borg', remo
logger.debug(' '.join(full_command))
with tempfile.TemporaryFile() as f_output:
subprocess.check_call(full_command, stdout=f_output)
f_output.seek(0)
return f_output.read().decode()
output = subprocess.check_output(full_command)
return output.decode() if output is not None else None

2
borgmatic/tests/unit/borg/test_list.py
View File

@ -8,7 +8,7 @@ from borgmatic.verbosity import VERBOSITY_SOME, VERBOSITY_LOTS
def insert_subprocess_mock(check_call_command, **kwargs):
subprocess = flexmock(module.subprocess)
subprocess.should_receive('check_call').with_args(check_call_command, stdout=object, **kwargs).once()
subprocess.should_receive('check_output').with_args(check_call_command, **kwargs).once()
LIST_COMMAND = ('borg', 'list', 'repo')