From ccd16271752f385074e7bb504c66adfdaaa5a913 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Wed, 25 Nov 2020 15:48:33 -0800 Subject: [PATCH] Fix timing-related test error in Alpine Edge. --- tests/integration/test_execute.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/integration/test_execute.py b/tests/integration/test_execute.py index 0484f6e32..05950d059 100644 --- a/tests/integration/test_execute.py +++ b/tests/integration/test_execute.py @@ -88,13 +88,15 @@ def test_log_outputs_skips_error_output_in_exception_for_process_with_none_stdou def test_log_outputs_kills_other_processes_when_one_errors(): flexmock(module.logger).should_receive('log') - flexmock(module).should_receive('exit_code_indicates_error').and_return(True) flexmock(module).should_receive('command_for_process').and_return('grep') process = subprocess.Popen(['grep'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + flexmock(module).should_receive('exit_code_indicates_error').with_args(process, None, 'borg').and_return(False) + flexmock(module).should_receive('exit_code_indicates_error').with_args(process, 2, 'borg').and_return(True) other_process = subprocess.Popen( ['watch', 'true'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) + flexmock(module).should_receive('exit_code_indicates_error').with_args(other_process, None, 'borg').and_return(False) flexmock(module).should_receive('output_buffer_for_process').with_args(process, ()).and_return( process.stdout )