Browse Source

Fix broken end-to-end test.

Dan Helfman 4 years ago
parent
commit
b619bde037
2 changed files with 5 additions and 4 deletions
  1. 4 4
      borgmatic/config/schema.yaml
  2. 1 0
      tests/end-to-end/test_borgmatic.py

+ 4 - 4
borgmatic/config/schema.yaml

@@ -28,10 +28,10 @@ map:
                     Paths to local or remote repositories (required). Tildes are
                     Paths to local or remote repositories (required). Tildes are
                     expanded. Multiple repositories are backed up to in
                     expanded. Multiple repositories are backed up to in
                     sequence. Borg placeholders can be used. See the output of
                     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:
                 example:
                     - user@backupserver:sourcehostname.borg
                     - user@backupserver:sourcehostname.borg
                     - "user@backupserver:{fqdn}"
                     - "user@backupserver:{fqdn}"

+ 1 - 0
tests/end-to-end/test_borgmatic.py

@@ -19,6 +19,7 @@ def generate_configuration(config_path, repository_path):
         open(config_path)
         open(config_path)
         .read()
         .read()
         .replace('user@backupserver:sourcehostname.borg', repository_path)
         .replace('user@backupserver:sourcehostname.borg', repository_path)
+        .replace('- user@backupserver:{fqdn}', '')
         .replace('- /home', '- {}'.format(config_path))
         .replace('- /home', '- {}'.format(config_path))
         .replace('- /etc', '')
         .replace('- /etc', '')
         .replace('- /var/log/syslog*', '')
         .replace('- /var/log/syslog*', '')