Use logger.getEffectiveLevel for arguments that should ONLY be at a

certain log level.

Extend the verbosity mock, s.t. it also mocks getEffectiveLevel
Found one more disallowed --debug --stats combination.

borgmatic/borg/create.py

@@ -148,7 +148,8 @@ def create_archive(
         + (('--remote-path', remote_path) if remote_path else ())
         + (('--umask', str(umask)) if umask else ())
         + (('--lock-wait', str(lock_wait)) if lock_wait else ())
-        + (('--list', '--filter', 'AME', '--info') if logger.isEnabledFor(logging.INFO) else ())
+        + (('--list', '--filter', 'AME',) if logger.isEnabledFor(logging.INFO) else ())
+        + (( '--info',) if logger.getEffectiveLevel() == logging.INFO else ())
         + (('--stats',) if not dry_run and logger.isEnabledFor(logging.INFO) else ())
         + (('--debug', '--show-rc') if logger.isEnabledFor(logging.DEBUG) else ())
         + (('--dry-run',) if dry_run else ())

borgmatic/borg/extract.py

@@ -13,12 +13,12 @@ def extract_last_archive_dry_run(repository, lock_wait=None, local_path='borg',
     '''
     remote_path_flags = ('--remote-path', remote_path) if remote_path else ()
     lock_wait_flags = ('--lock-wait', str(lock_wait)) if lock_wait else ()
+    verbosity_flags = ()
     if logger.isEnabledFor(logging.DEBUG):
         verbosity_flags = ('--debug', '--show-rc')
     elif logger.isEnabledFor(logging.INFO):
         verbosity_flags = ('--info',)
-    else:
-        verbosity_flags = ()
+    
 
     full_list_command = (
         local_path, 'list',

borgmatic/borg/info.py

@@ -16,7 +16,7 @@ def display_archives_info(repository, storage_config, local_path='borg', remote_
         (local_path, 'info', repository)
         + (('--remote-path', remote_path) if remote_path else ())
         + (('--lock-wait', str(lock_wait)) if lock_wait else ())
-        + (('--info',)  if logger.isEnabledFor(logging.INFO)  else ())
+        + (('--info',)  if logger.getEffectiveLevel() == logging.INFO else ())
         + (('--debug', '--show-rc') if logger.isEnabledFor(logging.DEBUG) else ())
         + (('--json',) if json else ())
     )

borgmatic/borg/list.py

@@ -16,7 +16,7 @@ def list_archives(repository, storage_config, local_path='borg', remote_path=Non
         (local_path, 'list', repository)
         + (('--remote-path', remote_path) if remote_path else ())
         + (('--lock-wait', str(lock_wait)) if lock_wait else ())
-        + (('--info',)  if logger.isEnabledFor(logging.INFO)  else ())
+        + (('--info',)  if logger.getEffectiveLevel() == logging.INFO  else ())
         + (('--debug', '--show-rc') if logger.isEnabledFor(logging.DEBUG) else ())
         + (('--json',) if json else ())
     )

borgmatic/borg/prune.py

@@ -52,7 +52,8 @@ def prune_archives(dry_run, repository, storage_config, retention_config, local_
         + (('--remote-path', remote_path) if remote_path else ())
         + (('--umask', str(umask)) if umask else ())
         + (('--lock-wait', str(lock_wait)) if lock_wait else ())
-        + (('--stats', '--info') if logger.isEnabledFor(logging.INFO) else ())
+        + (('--stats',) if not dry_run and logger.isEnabledFor(logging.INFO) else ())
+        + (( '--info',) if logger.getEffectiveLevel() == logging.INFO else ())
         + (('--debug', '--list', '--show-rc') if logger.isEnabledFor(logging.DEBUG) else ())
         + (('--dry-run',) if dry_run else ())
     )

borgmatic/tests/unit/borg/test_create.py

@@ -293,7 +293,7 @@ def test_create_archive_with_verbosity_lots_calls_borg_with_debug_parameter():
     flexmock(module).should_receive('_write_pattern_file').and_return(None)
     flexmock(module).should_receive('_make_pattern_flags').and_return(())
     flexmock(module).should_receive('_make_exclude_flags').and_return(())
-    insert_subprocess_mock(CREATE_COMMAND + ('--list', '--filter', 'AME', '--info', '--stats', '--debug', '--show-rc'))
+    insert_subprocess_mock(CREATE_COMMAND + ('--list', '--filter', 'AME','--stats', '--debug', '--show-rc'))
     insert_logging_mock(logging.DEBUG)
 
     module.create_archive(
@@ -359,7 +359,7 @@ def test_create_archive_with_dry_run_and_verbosity_lots_calls_borg_without_stats
     flexmock(module).should_receive('_make_pattern_flags').and_return(())
     flexmock(module).should_receive('_make_pattern_flags').and_return(())
     flexmock(module).should_receive('_make_exclude_flags').and_return(())
-    insert_subprocess_mock(CREATE_COMMAND + ('--list', '--filter', 'AME', '--info', '--debug', '--show-rc', '--dry-run'))
+    insert_subprocess_mock(CREATE_COMMAND + ('--list', '--filter', 'AME', '--debug', '--show-rc', '--dry-run'))
     insert_logging_mock(logging.DEBUG)
 
     module.create_archive(

borgmatic/tests/unit/borg/test_info.py

@@ -34,7 +34,7 @@ def test_display_archives_info_with_verbosity_some_calls_borg_with_info_paramete
 
 
 def test_display_archives_info_with_verbosity_lots_calls_borg_with_debug_parameter():
-    insert_subprocess_mock(INFO_COMMAND + ('--info', '--debug', '--show-rc'))
+    insert_subprocess_mock(INFO_COMMAND + ('--debug', '--show-rc'))
     insert_logging_mock(logging.DEBUG)
 
     module.display_archives_info(

borgmatic/tests/unit/borg/test_list.py

@@ -35,7 +35,7 @@ def test_list_archives_with_verbosity_some_calls_borg_with_info_parameter():
 
 
 def test_list_archives_with_verbosity_lots_calls_borg_with_debug_parameter():
-    insert_subprocess_mock(LIST_COMMAND + ('--info', '--debug', '--show-rc'))
+    insert_subprocess_mock(LIST_COMMAND + ('--debug', '--show-rc'))
     insert_logging_mock(logging.DEBUG)
 
     module.list_archives(

borgmatic/tests/unit/borg/test_prune.py

@@ -93,7 +93,7 @@ def test_prune_archives_with_verbosity_lots_calls_borg_with_debug_parameter():
     flexmock(module).should_receive('_make_prune_flags').with_args(retention_config).and_return(
         BASE_PRUNE_FLAGS,
     )
-    insert_subprocess_mock(PRUNE_COMMAND + ('--stats', '--info', '--debug', '--list', '--show-rc'))
+    insert_subprocess_mock(PRUNE_COMMAND + ('--stats', '--debug', '--list', '--show-rc'))
     insert_logging_mock(logging.DEBUG)
 
     module.prune_archives(

borgmatic/tests/unit/test_verbosity.py

@@ -8,6 +8,7 @@ def insert_logging_mock(log_level):
     """ Mocks the isEnabledFor from python logging. """
     logging = flexmock(module.logging.Logger)
     logging.should_receive('isEnabledFor').replace_with(lambda lvl : lvl >= log_level)
+    logging.should_receive('getEffectiveLevel').replace_with(lambda: log_level)
 
 
 def test_verbosity_to_log_level_maps_known_verbosity_to_log_level():