From ad7198ba66d6d57fb7a668d24a1c24a1b678e9a8 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Thu, 26 Nov 2020 16:22:42 -0800 Subject: [PATCH] Tweak to test failing on some machines. --- tests/integration/test_execute.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/integration/test_execute.py b/tests/integration/test_execute.py index 3c1a6c22b..490e3aba6 100644 --- a/tests/integration/test_execute.py +++ b/tests/integration/test_execute.py @@ -126,10 +126,15 @@ def test_log_outputs_kills_other_processes_when_one_errors(): def test_log_outputs_truncates_long_error_output(): flexmock(module).ERROR_OUTPUT_MAX_LINE_COUNT = 0 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) flexmock(module).should_receive('output_buffer_for_process').and_return(process.stdout) with pytest.raises(subprocess.CalledProcessError) as error: