From 5716e61f8f872ff7a2e1aac5507290e7e0f994f5 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Sat, 29 Mar 2025 19:54:40 -0700 Subject: [PATCH] Code formatting (#262). --- borgmatic/commands/borgmatic.py | 4 +--- tests/unit/commands/test_borgmatic.py | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/borgmatic/commands/borgmatic.py b/borgmatic/commands/borgmatic.py index 8bcdf82ae..f3281008c 100644 --- a/borgmatic/commands/borgmatic.py +++ b/borgmatic/commands/borgmatic.py @@ -961,9 +961,7 @@ def check_and_show_help_on_no_args(configs): default backup behavior. """ if len(sys.argv) == 1: # No arguments provided - default_actions = any( - config.get('default_actions', True) for config in configs.values() - ) + default_actions = any(config.get('default_actions', True) for config in configs.values()) if not default_actions: parse_arguments('--help') sys.exit(0) diff --git a/tests/unit/commands/test_borgmatic.py b/tests/unit/commands/test_borgmatic.py index 296bcbbf7..3abdff875 100644 --- a/tests/unit/commands/test_borgmatic.py +++ b/tests/unit/commands/test_borgmatic.py @@ -2120,6 +2120,8 @@ def test_collect_configuration_run_summary_logs_outputs_merged_json_results(): arguments=arguments, ) ) + + def test_check_and_show_help_on_no_args_shows_help_when_no_args_and_default_actions_false(): flexmock(module.sys).should_receive('argv').and_return(['borgmatic']) flexmock(module).should_receive('parse_arguments').with_args('--help').once() @@ -2140,33 +2142,34 @@ def test_check_and_show_help_on_no_args_does_not_show_help_when_args_provided(): flexmock(module.sys).should_receive('exit').never() module.check_and_show_help_on_no_args({'test.yaml': {'default_actions': False}}) + def test_check_and_show_help_on_no_args_with_no_default_actions_in_all_configs(): flexmock(module.sys).should_receive('argv').and_return(['borgmatic']) - + # Both configs have default_actions set to False, so help should be shown configs = { 'config1.yaml': {'default_actions': False}, - 'config2.yaml': {'default_actions': False} + 'config2.yaml': {'default_actions': False}, } - + # Expect help to be shown flexmock(module).should_receive('parse_arguments').with_args('--help').once() flexmock(module.sys).should_receive('exit').with_args(0).once() - + module.check_and_show_help_on_no_args(configs) + def test_check_and_show_help_on_no_args_with_conflicting_configs(): flexmock(module.sys).should_receive('argv').and_return(['borgmatic']) - + # Simulate two config files with conflicting 'default_actions' values configs = { 'config1.yaml': {'default_actions': True}, - 'config2.yaml': {'default_actions': False} + 'config2.yaml': {'default_actions': False}, } - + # Expect help not to be shown because at least one config enables default actions flexmock(module).should_receive('parse_arguments').never() flexmock(module.sys).should_receive('exit').never() - - module.check_and_show_help_on_no_args(configs) + module.check_and_show_help_on_no_args(configs)