瀏覽代碼

Fix broken end-to-end test.

Dan Helfman 4 年之前
父節點
當前提交
b619bde037
共有 2 個文件被更改,包括 5 次插入4 次删除
  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
                     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}"

+ 1 - 0
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*', '')