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

Fixing "check" backend tests to support new use of stderr=STDOUT.

Browse source
This commit is contained in:
Dan Helfman 2016-04-10 15:46:43 -07:00
parent 82e8dae948
commit 8210172d7f
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
atticmatic/tests/unit/backends/test_shared.py
View file

@ -1,4 +1,5 @@
from collections import OrderedDict from collections import OrderedDict
from subprocess import STDOUT
import os import os
from flexmock import flexmock from flexmock import flexmock
@ -31,7 +32,7 @@ def test_initialize_without_passphrase_should_not_set_environment():
def insert_subprocess_mock(check_call_command, **kwargs): def insert_subprocess_mock(check_call_command, **kwargs):
subprocess = flexmock() subprocess = flexmock(STDOUT=STDOUT)
subprocess.should_receive('check_call').with_args(check_call_command, **kwargs).once() subprocess.should_receive('check_call').with_args(check_call_command, **kwargs).once()
flexmock(module).subprocess = subprocess flexmock(module).subprocess = subprocess
@ -353,7 +354,7 @@ def test_check_archives_should_call_attic_with_parameters():
stdout = flexmock() stdout = flexmock()
insert_subprocess_mock( insert_subprocess_mock(
('attic', 'check', 'repo'), ('attic', 'check', 'repo'),
stdout=stdout, stdout=stdout, stderr=STDOUT,
) )
insert_platform_mock() insert_platform_mock()
insert_datetime_mock() insert_datetime_mock()
@ -374,7 +375,7 @@ def test_check_archives_with_verbosity_some_should_call_attic_with_verbose_param
flexmock(module).should_receive('_make_check_flags').and_return(()) flexmock(module).should_receive('_make_check_flags').and_return(())
insert_subprocess_mock( insert_subprocess_mock(
('attic', 'check', 'repo', '--verbose'), ('attic', 'check', 'repo', '--verbose'),
stdout=None, stdout=None, stderr=STDOUT,
) )
insert_platform_mock() insert_platform_mock()
insert_datetime_mock() insert_datetime_mock()
@ -393,7 +394,7 @@ def test_check_archives_with_verbosity_lots_should_call_attic_with_verbose_param
flexmock(module).should_receive('_make_check_flags').and_return(()) flexmock(module).should_receive('_make_check_flags').and_return(())
insert_subprocess_mock( insert_subprocess_mock(
('attic', 'check', 'repo', '--verbose'), ('attic', 'check', 'repo', '--verbose'),
stdout=None, stdout=None, stderr=STDOUT,
) )
insert_platform_mock() insert_platform_mock()
insert_datetime_mock() insert_datetime_mock()