From 1ba56d5262bdda416d956735d603e6725ac41aa3 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Thu, 13 Jun 2019 21:34:04 -0700 Subject: [PATCH] Fix tests in Python 3.6. --- tests/integration/test_execute.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/integration/test_execute.py b/tests/integration/test_execute.py index bf580d9f3..2270765f8 100644 --- a/tests/integration/test_execute.py +++ b/tests/integration/test_execute.py @@ -11,15 +11,15 @@ def test_execute_and_log_output_logs_each_line_separately(): flexmock(module.logger).should_receive('log').with_args(logging.INFO, 'hi').once() flexmock(module.logger).should_receive('log').with_args(logging.INFO, 'there').once() - module.execute_and_log_output(['echo', 'hi\nthere'], output_log_level=logging.INFO, shell=False) + module.execute_and_log_output(['echo', 'hi'], output_log_level=logging.INFO, shell=False) + module.execute_and_log_output(['echo', 'there'], output_log_level=logging.INFO, shell=False) def test_execute_and_log_output_logs_borg_error_as_error(): flexmock(module.logger).should_receive('error').with_args('borg: error: oopsie').once() - flexmock(module.logger).should_receive('log').with_args(logging.INFO, 'daisie').once() module.execute_and_log_output( - ['echo', 'borg: error: oopsie\ndaisie\n'], output_log_level=logging.INFO, shell=False + ['echo', 'borg: error: oopsie'], output_log_level=logging.INFO, shell=False )