psw/borgmatic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix config repositories consumption.

Browse source
This commit is contained in:
Dan Helfman 2019-02-18 13:27:35 -08:00
parent c41ffb5ceb
commit aa7c7651e5
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
borgmatic/config/validate.py
View file

@ -124,7 +124,7 @@ def guard_configuration_contains_repository(repository, configurations):
tuple( tuple(
config_repository config_repository
for config in configurations.values() for config in configurations.values()
for config_repository in config['repositories'] for config_repository in config['location']['repositories']
) )
) )
@ -141,7 +141,7 @@ def guard_configuration_contains_repository(repository, configurations):
tuple( tuple(
config_repository config_repository
for config in configurations.values() for config in configurations.values()
for config_repository in config['repositories'] for config_repository in config['location']['repositories']
if repository == config_repository if repository == config_repository
) )
) )

14
tests/unit/config/test_validate.py
View file

@ -94,27 +94,29 @@ def test_apply_logical_validation_does_not_raise_otherwise():
def test_guard_configuration_contains_repository_does_not_raise_when_repository_in_config(): def test_guard_configuration_contains_repository_does_not_raise_when_repository_in_config():
module.guard_configuration_contains_repository( module.guard_configuration_contains_repository(
repository='repo', configurations={'config.yaml': {'repositories': ['repo']}} repository='repo', configurations={'config.yaml': {'location': {'repositories': ['repo']}}}
) )
def test_guard_configuration_contains_repository_does_not_raise_when_repository_not_given(): def test_guard_configuration_contains_repository_does_not_raise_when_repository_not_given():
module.guard_configuration_contains_repository( module.guard_configuration_contains_repository(
repository=None, configurations={'config.yaml': {'repositories': ['repo']}} repository=None, configurations={'config.yaml': {'location': {'repositories': ['repo']}}}
) )
def test_guard_configuration_contains_repository_errors_when_repository_assumed_to_match_config_twice(): def test_guard_configuration_contains_repository_errors_when_repository_assumed_to_match_config_twice():
with pytest.raises(ValueError): with pytest.raises(ValueError):
module.guard_configuration_contains_repository( module.guard_configuration_contains_repository(
repository=None, configurations={'config.yaml': {'repositories': ['repo', 'repo2']}} repository=None,
configurations={'config.yaml': {'location': {'repositories': ['repo', 'repo2']}}},
) )
def test_guard_configuration_contains_repository_errors_when_repository_missing_from_config(): def test_guard_configuration_contains_repository_errors_when_repository_missing_from_config():
with pytest.raises(ValueError): with pytest.raises(ValueError):
module.guard_configuration_contains_repository( module.guard_configuration_contains_repository(
repository='nope', configurations={'config.yaml': {'repositories': ['repo', 'repo2']}} repository='nope',
configurations={'config.yaml': {'location': {'repositories': ['repo', 'repo2']}}},
) )
@ -123,7 +125,7 @@ def test_guard_configuration_contains_repository_errors_when_repository_matches_
module.guard_configuration_contains_repository( module.guard_configuration_contains_repository(
repository='repo', repository='repo',
configurations={ configurations={
'config.yaml': {'repositories': ['repo', 'repo2']}, 'config.yaml': {'location': {'repositories': ['repo', 'repo2']}},
'other.yaml': {'repositories': ['repo']}, 'other.yaml': {'location': {'repositories': ['repo']}},
}, },
) )