From b619bde037ef93375e5f43101a01f8bc1ce42f85 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Wed, 18 Nov 2020 14:20:07 -0800 Subject: [PATCH] Fix broken end-to-end test. --- borgmatic/config/schema.yaml | 8 ++++---- tests/end-to-end/test_borgmatic.py | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/borgmatic/config/schema.yaml b/borgmatic/config/schema.yaml index e7181fa88..35da6f33c 100644 --- a/borgmatic/config/schema.yaml +++ b/borgmatic/config/schema.yaml @@ -28,10 +28,10 @@ map: Paths to local or remote repositories (required). Tildes are expanded. Multiple repositories are backed up to in sequence. Borg placeholders can be used. See the output of - "borg help placeholders" for details. - See ssh_command for SSH options like identity file or port. - If systemd service is used, then add local repository paths - in the systemd service file to the ReadWritePaths list. + "borg help placeholders" for details. See ssh_command for + SSH options like identity file or port. If systemd service + is used, then add local repository paths in the systemd + service file to the ReadWritePaths list. example: - user@backupserver:sourcehostname.borg - "user@backupserver:{fqdn}" diff --git a/tests/end-to-end/test_borgmatic.py b/tests/end-to-end/test_borgmatic.py index 36c242a4a..24d728ece 100644 --- a/tests/end-to-end/test_borgmatic.py +++ b/tests/end-to-end/test_borgmatic.py @@ -19,6 +19,7 @@ def generate_configuration(config_path, repository_path): open(config_path) .read() .replace('user@backupserver:sourcehostname.borg', repository_path) + .replace('- user@backupserver:{fqdn}', '') .replace('- /home', '- {}'.format(config_path)) .replace('- /etc', '') .replace('- /var/log/syslog*', '')