Add "--repository" flag to the "check" action

This commit is contained in:
Nain 2023-03-16 08:34:52 -04:00
parent ce0ce4cd1c
commit 480addd7ce
3 changed files with 68 additions and 2 deletions

View file

@ -1,6 +1,7 @@
import logging import logging
import borgmatic.borg.check import borgmatic.borg.check
import borgmatic.config.validate
import borgmatic.hooks.command import borgmatic.hooks.command
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -23,6 +24,11 @@ def run_check(
''' '''
Run the "check" action for the given repository. Run the "check" action for the given repository.
''' '''
if check_arguments.repository and not borgmatic.config.validate.repositories_match(
repository, check_arguments.repository
):
return
borgmatic.hooks.command.execute_hook( borgmatic.hooks.command.execute_hook(
hooks.get('before_check'), hooks.get('before_check'),
hooks.get('umask'), hooks.get('umask'),

View file

@ -419,6 +419,10 @@ def make_parsers():
add_help=False, add_help=False,
) )
check_group = check_parser.add_argument_group('check arguments') check_group = check_parser.add_argument_group('check arguments')
check_group.add_argument(
'--repository',
help='Path of specific existing repository to check (must be already specified in a borgmatic configuration file)',
)
check_group.add_argument( check_group.add_argument(
'--progress', '--progress',
dest='progress', dest='progress',

View file

@ -3,7 +3,7 @@ from flexmock import flexmock
from borgmatic.actions import check as module from borgmatic.actions import check as module
def test_run_check_calls_hooks(): def test_run_check_calls_hooks_for_configured_repository():
flexmock(module.logger).answer = lambda message: None flexmock(module.logger).answer = lambda message: None
flexmock(module.borgmatic.config.checks).should_receive( flexmock(module.borgmatic.config.checks).should_receive(
'repository_enabled_for_checks' 'repository_enabled_for_checks'
@ -11,7 +11,63 @@ def test_run_check_calls_hooks():
flexmock(module.borgmatic.borg.check).should_receive('check_archives') flexmock(module.borgmatic.borg.check).should_receive('check_archives')
flexmock(module.borgmatic.hooks.command).should_receive('execute_hook').times(2) flexmock(module.borgmatic.hooks.command).should_receive('execute_hook').times(2)
check_arguments = flexmock( check_arguments = flexmock(
progress=flexmock(), repair=flexmock(), only=flexmock(), force=flexmock() repository=None, progress=flexmock(), repair=flexmock(), only=flexmock(), force=flexmock()
)
global_arguments = flexmock(monitoring_verbosity=1, dry_run=False)
module.run_check(
config_filename='test.yaml',
repository='repo',
location={'repositories': ['repo']},
storage={},
consistency={},
hooks={},
hook_context={},
local_borg_version=None,
check_arguments=check_arguments,
global_arguments=global_arguments,
local_path=None,
remote_path=None,
)
def test_run_check_runs_with_select_repository():
flexmock(module.logger).answer = lambda message: None
flexmock(module.borgmatic.config.validate).should_receive('repositories_match').and_return(True)
flexmock(module.borgmatic.borg.check).should_receive('check_archives')
check_arguments = flexmock(
repository='repo', progress=flexmock(), repair=flexmock(), only=flexmock(), force=flexmock()
)
global_arguments = flexmock(monitoring_verbosity=1, dry_run=False)
module.run_check(
config_filename='test.yaml',
repository='repo',
location={'repositories': ['repo']},
storage={},
consistency={},
hooks={},
hook_context={},
local_borg_version=None,
check_arguments=check_arguments,
global_arguments=global_arguments,
local_path=None,
remote_path=None,
)
def test_run_check_bails_if_repository_does_not_match():
flexmock(module.logger).answer = lambda message: None
flexmock(module.borgmatic.config.validate).should_receive('repositories_match').and_return(
False
)
flexmock(module.borgmatic.borg.check).should_receive('check_archives').never()
check_arguments = flexmock(
repository='repo2',
progress=flexmock(),
repair=flexmock(),
only=flexmock(),
force=flexmock(),
) )
global_arguments = flexmock(monitoring_verbosity=1, dry_run=False) global_arguments = flexmock(monitoring_verbosity=1, dry_run=False)