From e5153784975132a856db8921292779a23b2a1e2c Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Fri, 13 Nov 2020 21:56:15 +0100 Subject: [PATCH] bundles/backup-server: dummy nodes never do backups --- bundles/backup-server/metadata.py | 2 +- hooks/test_backup_metadata.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bundles/backup-server/metadata.py b/bundles/backup-server/metadata.py index bb89fe6..ce0f909 100644 --- a/bundles/backup-server/metadata.py +++ b/bundles/backup-server/metadata.py @@ -3,7 +3,7 @@ def get_my_clients(metadata): my_clients = {} for rnode in repo.nodes: - if rnode.metadata.get('backups/exclude_from_backups', False): + if rnode.metadata.get('backups/exclude_from_backups', False) or rnode.dummy: continue my_clients[rnode.name] = { diff --git a/hooks/test_backup_metadata.py b/hooks/test_backup_metadata.py index 54032c4..5297212 100644 --- a/hooks/test_backup_metadata.py +++ b/hooks/test_backup_metadata.py @@ -1,3 +1,8 @@ def test_node(repo, node, **kwargs): - if not node.metadata.get('backups', {}).get('exclude_from_backups', False): - assert len(node.metadata.get('backups', {}).get('paths', set())) > 0, f'{node.name} has backups configured, but no backup paths defined!' + if node.metadata.get('backups', {}).get('exclude_from_backups', False): + return + + if node.dummy: + return + + assert len(node.metadata.get('backups', {}).get('paths', set())) > 0, f'{node.name} has backups configured, but no backup paths defined!'