From 603e055a39916b759bd78d82637891e2858d77fd Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Sat, 22 Jun 2019 16:29:25 -0700 Subject: [PATCH] Fix borgmatic command unit tests for new parsed arguments. --- tests/unit/commands/test_borgmatic.py | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/unit/commands/test_borgmatic.py b/tests/unit/commands/test_borgmatic.py index ced1624..ed6da98 100644 --- a/tests/unit/commands/test_borgmatic.py +++ b/tests/unit/commands/test_borgmatic.py @@ -27,9 +27,9 @@ def test_load_configurations_logs_critical_for_parse_error(): def test_collect_configuration_run_summary_logs_info_for_success(): flexmock(module).should_receive('run_configuration').and_return([]) - args = flexmock(extract=False, list=False) + arguments = {} - logs = tuple(module.collect_configuration_run_summary_logs({'test.yaml': {}}, args=args)) + logs = tuple(module.collect_configuration_run_summary_logs({'test.yaml': {}}, arguments=arguments)) assert all(log for log in logs if log.levelno == module.logging.INFO) @@ -37,9 +37,9 @@ def test_collect_configuration_run_summary_logs_info_for_success(): def test_collect_configuration_run_summary_logs_info_for_success_with_extract(): flexmock(module.validate).should_receive('guard_configuration_contains_repository') flexmock(module).should_receive('run_configuration').and_return([]) - args = flexmock(extract=True, list=False, repository='repo') + arguments = {'extract': flexmock(repository='repo')} - logs = tuple(module.collect_configuration_run_summary_logs({'test.yaml': {}}, args=args)) + logs = tuple(module.collect_configuration_run_summary_logs({'test.yaml': {}}, arguments=arguments)) assert all(log for log in logs if log.levelno == module.logging.INFO) @@ -48,9 +48,9 @@ def test_collect_configuration_run_summary_logs_critical_for_extract_with_reposi flexmock(module.validate).should_receive('guard_configuration_contains_repository').and_raise( ValueError ) - args = flexmock(extract=True, list=False, repository='repo') + arguments = {'extract': flexmock(repository='repo')} - logs = tuple(module.collect_configuration_run_summary_logs({'test.yaml': {}}, args=args)) + logs = tuple(module.collect_configuration_run_summary_logs({'test.yaml': {}}, arguments=arguments)) assert any(log for log in logs if log.levelno == module.logging.CRITICAL) @@ -59,18 +59,18 @@ def test_collect_configuration_run_summary_logs_critical_for_list_with_archive_a flexmock(module.validate).should_receive('guard_configuration_contains_repository').and_raise( ValueError ) - args = flexmock(extract=False, list=True, repository='repo', archive='test') + arguments = {'list': flexmock(repository='repo', archive='test')} - logs = tuple(module.collect_configuration_run_summary_logs({'test.yaml': {}}, args=args)) + logs = tuple(module.collect_configuration_run_summary_logs({'test.yaml': {}}, arguments=arguments)) assert any(log for log in logs if log.levelno == module.logging.CRITICAL) def test_collect_configuration_run_summary_logs_info_for_success_with_list(): flexmock(module).should_receive('run_configuration').and_return([]) - args = flexmock(extract=False, list=True, repository='repo', archive=None) + arguments = {'list': flexmock(repository='repo', archive=None)} - logs = tuple(module.collect_configuration_run_summary_logs({'test.yaml': {}}, args=args)) + logs = tuple(module.collect_configuration_run_summary_logs({'test.yaml': {}}, arguments=arguments)) assert all(log for log in logs if log.levelno == module.logging.INFO) @@ -78,9 +78,9 @@ def test_collect_configuration_run_summary_logs_info_for_success_with_list(): def test_collect_configuration_run_summary_logs_critical_for_run_error(): flexmock(module.validate).should_receive('guard_configuration_contains_repository') flexmock(module).should_receive('run_configuration').and_raise(ValueError) - args = flexmock(extract=False, list=False) + arguments = {} - logs = tuple(module.collect_configuration_run_summary_logs({'test.yaml': {}}, args=args)) + logs = tuple(module.collect_configuration_run_summary_logs({'test.yaml': {}}, arguments=arguments)) assert any(log for log in logs if log.levelno == module.logging.CRITICAL) @@ -90,19 +90,19 @@ def test_collect_configuration_run_summary_logs_outputs_merged_json_results(): ['baz'] ) flexmock(module.sys.stdout).should_receive('write').with_args('["foo", "bar", "baz"]').once() - args = flexmock(extract=False, list=False) + arguments = {} tuple( module.collect_configuration_run_summary_logs( - {'test.yaml': {}, 'test2.yaml': {}}, args=args + {'test.yaml': {}, 'test2.yaml': {}}, arguments=arguments ) ) def test_collect_configuration_run_summary_logs_critical_for_missing_configs(): flexmock(module).should_receive('run_configuration').and_return([]) - args = flexmock(extract=False, list=False, config_paths=[]) + arguments = {'global': flexmock(config_paths=[])} - logs = tuple(module.collect_configuration_run_summary_logs({}, args=args)) + logs = tuple(module.collect_configuration_run_summary_logs({}, arguments=arguments)) assert any(log for log in logs if log.levelno == module.logging.CRITICAL)